Commit 20d3ecc

Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues executing. If a newer commit completes first, the timed-out handler's eventual resolution would call updatePreviewServerSnapshot with stale dimensions, overwriting the correct newer state. Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler. The signal is aborted on timeout, and handleViewportChange checks signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

‎apps/web/src/browser/browserViewportActions.test.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();

‎apps/web/src/browser/browserViewportActions.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};

‎apps/web/src/components/preview/PreviewView.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 20d3ecc
Browse files
cursoragentcursoragent
committed
Fix stale viewport update after timeout by passing AbortSignal to handler
When runHandlerWithTimeout times out, the underlying handler continues
executing. If a newer commit completes first, the timed-out handler's
eventual resolution would call updatePreviewServerSnapshot with stale
dimensions, overwriting the correct newer state.
Fix: Pass an AbortSignal from runHandlerWithTimeout to the handler.
The signal is aborted on timeout, and handleViewportChange checks
signal.aborted before applying side effects.
1 parent f0c571c commit 20d3ecc
3 files changed
Lines changed: 26 additions & 9 deletions
File tree
‎apps/web/src/browser/browserViewportActions.test.ts‎
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ describe("browserViewportActions", () => {
2121
height: 700,
2222
});
2323
expect(first).not.toHaveBeenCalled();
24-
expect(second).toHaveBeenCalledWith({_tag: "freeform",width: 900,height: 700});
24+
expect(second).toHaveBeenCalledWith(
25+
{_tag: "freeform",width: 900,height: 700},
26+
expect.any(AbortSignal),
27+
);
2528

2629
unsubscribeSecond();
2730
awaitexpect(
@@ -75,7 +78,9 @@ describe("browserViewportActions", () => {
7578
vi.useFakeTimers();
7679
try{
7780
constnever=newPromise<void>(()=>undefined);
78-
consthandler=vi.fn(async(_setting: PreviewViewportSetting): Promise<void>=>undefined);
81+
consthandler=vi.fn(
82+
async(_setting: PreviewViewportSetting,_signal: AbortSignal): Promise<void>=>undefined,
83+
);
7984
handler.mockImplementationOnce(()=>never).mockResolvedValueOnce(undefined);
8085
constunsubscribe=subscribeBrowserViewportChange("tab-timeout",handler);
8186
constfirst=commitBrowserViewportChange("tab-timeout",{
@@ -97,7 +102,11 @@ describe("browserViewportActions", () => {
97102
awaitsecond;
98103

99104
expect(handler).toHaveBeenCalledTimes(2);
105+
expect(handler.mock.calls[0]?.[1]).toBeInstanceOf(AbortSignal);
106+
expect((handler.mock.calls[0]?.[1]asAbortSignal).aborted).toBe(true);
100107
expect(handler.mock.calls[1]?.[0]).toMatchObject({width: 900,height: 700});
108+
expect(handler.mock.calls[1]?.[1]).toBeInstanceOf(AbortSignal);
109+
expect((handler.mock.calls[1]?.[1]asAbortSignal).aborted).toBe(false);
101110
unsubscribe();
102111
}finally{
103112
vi.useRealTimers();
‎apps/web/src/browser/browserViewportActions.ts‎
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
importtype{PreviewViewportSetting}from"@t3tools/contracts";
22

3-
typeBrowserViewportHandler=(setting: PreviewViewportSetting)=>Promise<void>;
3+
typeBrowserViewportHandler=(
4+
setting: PreviewViewportSetting,
5+
signal: AbortSignal,
6+
)=>Promise<void>;
47

58
exportconstBROWSER_VIEWPORT_COMMIT_TIMEOUT_MS=15_000;
69

@@ -20,14 +23,18 @@ const runHandlerWithTimeout = (
2023
handler: BrowserViewportHandler,
2124
setting: PreviewViewportSetting,
2225
): Promise<void>=>{
26+
constcontroller=newAbortController();
2327
lettimeoutId: ReturnType<typeofsetTimeout>|undefined;
2428
consttimeout=newPromise<never>((_resolve,reject)=>{
25-
timeoutId=setTimeout(
26-
()=>reject(newBrowserViewportCommitTimeoutError(tabId)),
27-
BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS,
28-
);
29+
timeoutId=setTimeout(()=>{
30+
controller.abort();
31+
reject(newBrowserViewportCommitTimeoutError(tabId));
32+
},BROWSER_VIEWPORT_COMMIT_TIMEOUT_MS);
2933
});
30-
returnPromise.race([Promise.resolve().then(()=>handler(setting)),timeout]).finally(()=>{
34+
returnPromise.race([
35+
Promise.resolve().then(()=>handler(setting,controller.signal)),
36+
timeout,
37+
]).finally(()=>{
3138
if(timeoutId!==undefined)clearTimeout(timeoutId);
3239
});
3340
};
‎apps/web/src/components/preview/PreviewView.tsx‎
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
152152
},[tabId]);
153153

154154
consthandleViewportChange=useCallback(
155-
async(nextViewport: PreviewViewportSetting)=>{
155+
async(nextViewport: PreviewViewportSetting,signal: AbortSignal)=>{
156156
if(!tabId)return;
157157
constresult=awaitresize({
158158
environmentId: threadRef.environmentId,
@@ -162,6 +162,7 @@ export function PreviewView({ threadRef, tabId: requestedTabId, configuredUrls,
162162
viewport: nextViewport,
163163
},
164164
});
165+
if(signal.aborted)return;
165166
if(result._tag==="Failure"){
166167
consterror=squashAtomCommandFailure(result);
167168
toastManager.add({
0 commit comments
Comments
 (0)