@@ -295,6 +295,8 @@ interface ServerTab {
295295 readonly page : Page ;
296296 readonly cdp : CDPSession ;
297297 readonly frameSessions : Map < Frame , CDPSession > ;
298+ /** Copy reads run in key order, outside the input queue. */
299+ copyReads : Promise < void > ;
298300 readonly createdAt : number ;
299301 usedAt : number ;
300302 readonly viewers : Set < ViewerState > ;
@@ -427,16 +429,15 @@ const CLIPBOARD_WORLD = "t3-preview-clipboard";
427429// Chromium shares its clipboard across contexts; capture real copy/cut keys in a page-inaccessible world instead.
428430const CLIPBOARD_SCRIPT = `(() => {
429431 let keying = false;
430- let keyedAt = 0;
431- let copied = "" ;
432+ // One entry per copy or cut key, oldest first, so a later key cannot overwrite an unread copy.
433+ const copies = [] ;
432434 // The same Ctrl or Cmd + C or X that editingCommand sends as copy or cut.
433435 addEventListener("keydown", (event) => {
434436 if (!event.isTrusted || event.altKey || event.ctrlKey === event.metaKey) return;
435437 const key = event.key.toLowerCase();
436438 if (key !== "c" && key !== "x") return;
437439 keying = true;
438- keyedAt = Date.now();
439- copied = "";
440+ copies.push({ at: Date.now(), text: "" });
440441 setTimeout(() => { keying = false; });
441442 }, true);
442443 const selection = () => {
@@ -447,7 +448,8 @@ const CLIPBOARD_SCRIPT = `(() => {
447448 return String(document.getSelection() ?? "");
448449 };
449450 const record = (text) => {
450- copied = String(text ?? "").slice(0, ${ CLIPBOARD_TEXT_LIMIT } );
451+ const copy = copies.at(-1);
452+ if (copy) copy.text = String(text ?? "").slice(0, ${ CLIPBOARD_TEXT_LIMIT } );
451453 };
452454 // Capturing at window runs before page handlers can stop the event, and
453455 // before cut removes the selection.
@@ -462,11 +464,10 @@ const CLIPBOARD_SCRIPT = `(() => {
462464 addEventListener(type, snapshot, true);
463465 addEventListener(type, replace);
464466 }
465- // Only a key dispatched at or after since made this copy; older ones are stale.
467+ // Copies from keys dispatched before since are stale.
466468 globalThis.takeCopy = (since) => {
467- const text = keyedAt >= since ? copied : "";
468- copied = "";
469- return text;
469+ while (copies.length > 0 && copies[0].at < since) copies.shift();
470+ return copies.shift()?.text ?? "";
470471 };
471472})();` ;
472473
@@ -870,6 +871,7 @@ const make = Effect.gen(function* () {
870871 page,
871872 cdp,
872873 frameSessions : new Map ( ) ,
874+ copyReads : Promise . resolve ( ) ,
873875 createdAt : Date . now ( ) ,
874876 usedAt : Date . now ( ) ,
875877 viewers : new Set ( ) ,
@@ -2464,11 +2466,14 @@ const make = Effect.gen(function* () {
24642466 ) ,
24652467 } ) ;
24662468 viewer . pressedKeys . set ( code || key , { key, code } ) ;
2467- if ( copying ) {
2469+ if ( ! copying ) return ;
2470+ // A busy frame answers late; its read must not hold later input.
2471+ const read = tab . copyReads . then ( async ( ) => {
24682472 const copied = await takeCopiedText ( tab , since ) ;
24692473 if ( copied ) viewer . push ( { _tag : "clipboard" , text : copied } ) ;
2470- }
2471- return ;
2474+ } ) ;
2475+ tab . copyReads = read ;
2476+ return ( ) => read ;
24722477 }
24732478 case "text" :
24742479 if ( typeof message . text === "string" && message . text . length > 0 ) {
@@ -2724,8 +2729,9 @@ const make = Effect.gen(function* () {
27242729 : { } ) ,
27252730 } ) ;
27262731 } else {
2727- const dispatch = ( input : Record < string , unknown > ) =>
2728- dispatchViewerInput ( tab , session , viewer , input ) ;
2732+ const dispatch = async ( input : Record < string , unknown > ) => {
2733+ await dispatchViewerInput ( tab , session , viewer , input ) ;
2734+ } ;
27292735 if (
27302736 message . type === "mouse" &&
27312737 message . action === "move" &&
@@ -2752,7 +2758,10 @@ const make = Effect.gen(function* () {
27522758 } ) ,
27532759 ) ;
27542760 } else {
2755- await tab . control . human ( viewer . id , ( ) => dispatch ( message ) ) ;
2761+ const copyRead = await tab . control . human ( viewer . id , ( ) =>
2762+ dispatchViewerInput ( tab , session , viewer , message ) ,
2763+ ) ;
2764+ await copyRead ?.( ) ;
27562765 }
27572766 }
27582767 } catch {
0 commit comments