Skip to content

[codex] Throttle settings injector retries #219

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

Draft
kkkayye wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[codex] Throttle settings injector retries #219

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
24 changes: 20 additions & 4 deletions packages/installer/assets/runtime/preload.js
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 21 additions & 3 deletions packages/installer/assets/runtime/preload/settings-injector.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/installer/assets/runtime/preload/settings-injector.js.map
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 23 additions & 3 deletions packages/runtime/src/preload/settings-injector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,27 @@ function plog(msg: string, extra?: unknown): void {
`[settings-injector] ${msg}${extra === undefined ? "" : " " + safeStringify(extra)}`,
);
}

let pendingInject = false;
let lastSidebarMissingLogAt = 0;

function plogThrottled(msg: string, extra?: unknown): void {
const now = Date.now();
if (now - lastSidebarMissingLogAt < 5000) return;
lastSidebarMissingLogAt = now;
plog(msg, extra);
}

function scheduleInject(): void {
if (pendingInject) return;
pendingInject = true;
setTimeout(() => {
pendingInject = false;
tryInject();
maybeDumpDom();
}, 250);
}

function safeStringify(v: unknown): string {
try {
return typeof v === "string" ? v : JSON.stringify(v);
Expand All @@ -241,8 +262,7 @@ export function startSettingsInjector(): void {
if (state.observer) return;

const obs = new MutationObserver(() => {
tryInject();
maybeDumpDom();
scheduleInject();
});
obs.observe(document.documentElement, { childList: true, subtree: true });
state.observer = obs;
Expand Down Expand Up @@ -372,7 +392,7 @@ function tryInject(): void {
const itemsGroup = findSidebarItemsGroup();
if (!itemsGroup) {
scheduleSettingsSurfaceHidden();
plog("sidebar not found");
plogThrottled("sidebar not found");
return;
}
if (state.settingsSurfaceHideTimer) {
Expand Down