Skip to content

Sync scriptlets with upstream #27

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
seia-soto merged 1 commit into from
Sep 25, 2025
Merged

Sync scriptlets with upstream #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"type": "module",
"scripts": {
"build": "deno build.ts --tagName 1.66.4 > ubo.js",
"build": "deno build.ts --tagName 1.66.5b0 > ubo.js",
"test": "node --test"
},
"author": {
Expand Down
167 changes: 89 additions & 78 deletions ubo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31806,92 +31806,103 @@ function trustedClickElement(
return shadowRoot && querySelectorEx(inside, shadowRoot);
};

const selectorList = safe.String_split.call(selectors, /\s*,\s*/)
.filter(s => {
try {
void querySelectorEx(s);
} catch {
return false;
}
return true;
});
if ( selectorList.length === 0 ) { return; }

const steps = safe.String_split.call(selectors, /\s*,\s*/).map(a => {
if ( /^\d+$/.test(a) ) { return parseInt(a, 10); }
return a;
});
if ( steps.length === 0 ) { return; }
const clickDelay = parseInt(delay, 10) || 1;
const t0 = Date.now();
const tbye = t0 + 10000;
let tnext = selectorList.length !== 1 ? t0 : t0 + clickDelay;
for ( let i = steps.length-1; i > 0; i-- ) {
if ( typeof steps[i] !== 'string' ) { continue; }
if ( typeof steps[i-1] !== 'string' ) { continue; }
steps.splice(i, 0, clickDelay);
}
if ( typeof steps.at(-1) !== 'number' ) {
steps.push(10000);
}

const terminate = ( ) => {
selectorList.length = 0;
next.stop();
observe.stop();
};

const next = notFound => {
if ( selectorList.length === 0 ) {
safe.uboLog(logPrefix, 'Completed');
return terminate();
}
const tnow = Date.now();
if ( tnow >= tbye ) {
safe.uboLog(logPrefix, 'Timed out');
return terminate();
}
if ( notFound ) { observe(); }
const delay = Math.max(notFound ? tbye - tnow : tnext - tnow, 1);
next.timer = setTimeout(( ) => {
next.timer = undefined;
process();
}, delay);
safe.uboLog(logPrefix, `Waiting for ${selectorList[0]}...`);
};
next.stop = ( ) => {
if ( next.timer === undefined ) { return; }
clearTimeout(next.timer);
next.timer = undefined;
};

const observe = ( ) => {
if ( observe.observer !== undefined ) { return; }
observe.observer = new MutationObserver(( ) => {
if ( observe.timer !== undefined ) { return; }
observe.timer = setTimeout(( ) => {
observe.timer = undefined;
process();
}, 20);
const waitForTime = ms => {
return new Promise(resolve => {
safe.uboLog(logPrefix, `Waiting for ${ms} ms`);
waitForTime.timer = setTimeout(( ) => {
waitForTime.timer = undefined;
resolve();
}, ms);
});
observe.observer.observe(document, {
attributes: true,
childList: true,
subtree: true,
};
waitForTime.cancel = ( ) => {
const { timer } = waitForTime;
if ( timer === undefined ) { return; }
clearTimeout(timer);
waitForTime.timer = undefined;
};

const waitForElement = selector => {
return new Promise(resolve => {
const elem = querySelectorEx(selector);
if ( elem !== null ) {
elem.click();
resolve();
return;
}
safe.uboLog(logPrefix, `Waiting for ${selector}`);
const observer = new MutationObserver(( ) => {
const elem = querySelectorEx(selector);
if ( elem === null ) { return; }
waitForElement.cancel();
elem.click();
resolve();
});
observer.observe(document, {
attributes: true,
childList: true,
subtree: true,
});
waitForElement.observer = observer;
});
};
observe.stop = ( ) => {
if ( observe.timer !== undefined ) {
clearTimeout(observe.timer);
observe.timer = undefined;
}
if ( observe.observer ) {
observe.observer.disconnect();
observe.observer = undefined;
}
waitForElement.cancel = ( ) => {
const { observer } = waitForElement;
if ( observer === undefined ) { return; }
waitForElement.observer = undefined;
observer.disconnect();
};

const waitForTimeout = ms => {
waitForTimeout.cancel();
waitForTimeout.timer = setTimeout(( ) => {
waitForTimeout.timer = undefined;
terminate();
safe.uboLog(logPrefix, `Timed out after ${ms} ms`);
}, ms);
};
waitForTimeout.cancel = ( ) => {
if ( waitForTimeout.timer === undefined ) { return; }
clearTimeout(waitForTimeout.timer);
waitForTimeout.timer = undefined;
};

const process = ( ) => {
next.stop();
if ( Date.now() < tnext ) { return next(); }
const selector = selectorList.shift();
if ( selector === undefined ) { return terminate(); }
const elem = querySelectorEx(selector);
if ( elem === null ) {
selectorList.unshift(selector);
return next(true);
const terminate = ( ) => {
waitForTime.cancel();
waitForElement.cancel();
waitForTimeout.cancel();
};

const process = async ( ) => {
waitForTimeout(steps.pop());
while ( steps.length !== 0 ) {
const step = steps.shift();
if ( step === undefined ) { break; }
if ( typeof step === 'number' ) {
await waitForTime(step);
if ( step === 1 ) { continue; }
continue;
}
if ( step.startsWith('!') ) { continue; }
await waitForElement(step);
safe.uboLog(logPrefix, `Clicked ${step}`);
}
safe.uboLog(logPrefix, `Clicked ${selector}`);
elem.click();
tnext += clickDelay;
next();
terminate();
};

runAtHtmlElementFn(process);
Expand Down