windows-development-sandbox 1.13.2 → 1.15.0

package/dist/shared/pty/terminal.js

@@ -3,20 +3,37 @@ import { OutputFilter } from './output-filter.js';
 import { enableVtInput } from './console-input.js';
 import { InputJoiner, JOIN_MS } from './input-joiner.js';
 import { CTRL_C_CONFIRM_MS, CtrlCGuard } from './ctrl-c.js';
+import { KeyGate } from './key-gate.js';
+import { MouseModes } from './mouse-modes.js';
 /**
  * Turns off every mouse tracking mode a program may have turned on in your terminal (normal, button, any, UTF-8, SGR,
  * urxvt).
  */
 export const MOUSE_OFF = '\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1005l\x1b[?1006l\x1b[?1015l';
-/**
- * Node on Windows reads keys through the console API, where Backspace is ^H and Ctrl+Backspace is DEL: the reverse of
- * what terminals send. ConPTY reads ^H as Ctrl+Backspace (delete a word), so swap them back.
- */
-export function fixWindowsKeys(chunk) {
-    if (!chunk.includes(0x08) && !chunk.includes(0x7f))
-        return chunk;
-    return Buffer.from(chunk.map((b) => (b === 0x08 ? 0x7f : b === 0x7f ? 0x08 : b)));
+/** After leaving: mouse reports still on their way are dropped until input is this quiet (at most SETTLE_MAX_MS). */
+const SETTLE_QUIET_MS = 50;
+const SETTLE_MAX_MS = 300;
+/** Waits until `stream` has been quiet for SETTLE_QUIET_MS (or SETTLE_MAX_MS passed), dropping what it reads. */
+function drainInput(stream) {
+    return new Promise((done) => {
+        let quiet;
+        const end = () => {
+            clearTimeout(quiet);
+            clearTimeout(cap);
+            stream.off('data', onData);
+            done();
+        };
+        const onData = () => {
+            clearTimeout(quiet);
+            quiet = setTimeout(end, SETTLE_QUIET_MS);
+        };
+        const cap = setTimeout(end, SETTLE_MAX_MS);
+        stream.on('data', onData);
+        onData();
+    });
 }
+/** Longest wait for the console's input mode before typed keys are sent anyway (it normally takes about 2 s). */
+const VT_WAIT_MS = 10000;
 /**
  * Bridges this process's terminal to the remote program until it exits, the connection drops, or the user presses
  * the detach key. Restores the terminal before resolving.
@@ -32,8 +49,8 @@ options = {}) {
         const [c, r] = stdout.isTTY ? stdout.getWindowSize() : [0, 0];
         return [c || 120, r || 30];
     };
-    // Until the console passes the terminal's input through as it is (enableVtInput), Node turns Backspace into ^H.
-    let swapKeys = process.platform === 'win32' && stdin.isTTY;
+    // Until the console's input mode is known (enableVtInput), what is typed waits: see KeyGate.
+    const keys = new KeyGate(process.platform === 'win32' && Boolean(stdin.isTTY));
     return new Promise((resolve) => {
         let done = false;
         const reader = new FrameReader();
@@ -42,7 +59,10 @@ options = {}) {
         let resizeTimer;
         // Set once raw mode is on (below); finish() may run before that.
         // eslint-disable-next-line prefer-const
-        let vtInput;
+        let vtInput, vtTimer;
+        // The agent's mouse modes, read from its output; only known when it is passed through (conpty.dll, see below).
+        const mouse = new MouseModes();
+        let passthrough = false;
         const finish = (result) => {
             if (done)
                 return;
@@ -54,11 +74,16 @@ options = {}) {
             clearInterval(sizeWatch);
             clearTimeout(joinTimer);
             clearTimeout(hintTimer);
+            clearTimeout(vtTimer);
             socket.destroy();
-            // The agent's mouse tracking ends with it: your terminal's wheel scrolls again (and clicks select text).
-            stdout.write('\x1b[0m\x1b[?25h' + MOUSE_OFF + '\r\n');
+            // The agent's mouse tracking ends with it: your terminal's wheel scrolls again (and clicks select text). Reports
+            // the terminal sent before it read that are dropped here, or they would reach your shell as text.
+            const tracked = mouse.tracking();
+            const reset = '\x1b[0m\x1b[?25h' + MOUSE_OFF + (mouse.has(2004) ? '\x1b[?2004l' : '') + '\r\n';
+            const flushed = new Promise((written) => stdout.write(reset, () => written()));
+            const settled = tracked ? flushed.then(() => drainInput(stdin)) : Promise.resolve();
             // Wait for a console-mode change still in progress, then give the console back in its normal mode.
-            void (vtInput?.stop() ?? Promise.resolve()).then(() => {
+            void Promise.all([settled, vtInput?.stop()]).then(() => {
                 if (stdin.isTTY)
                     stdin.setRawMode(false);
                 stdin.pause();
@@ -67,10 +92,12 @@ options = {}) {
         };
         const joiner = new InputJoiner();
         let joinTimer;
-        const sendInput = (data) => {
+        const write = (data) => {
             if (data.length && !done)
-                socket.write(encodeFrame(FrameType.Input, swapKeys ? fixWindowsKeys(data) : data));
+                socket.write(encodeFrame(FrameType.Input, data));
         };
+        // Mouse reports the agent has not asked for (motion without 1002/1003 ...) are dropped: see MouseModes.
+        const sendInput = (data) => write(keys.push(passthrough ? mouse.filter(data) : data));
         const guard = options.confirmCtrlC ? new CtrlCGuard() : null;
         let hintTimer;
         const onInput = (chunk) => {
@@ -99,7 +126,6 @@ options = {}) {
         // repaints racing each other left the screen garbled. Wait until the size settles, clear what this terminal
         // reflowed on its own, then let ptyhost repaint everything once at the new size. With conpty.dll (passthrough)
         // nothing is repainted: this terminal's own reflow and scrollback stay, and the program redraws what it needs.
-        let passthrough = false;
         const sendSize = () => {
             const [c, r] = size();
             if (c === sent[0] && r === sent[1])
@@ -134,13 +160,16 @@ options = {}) {
             for (const frame of frames) {
                 if (frame.type === FrameType.Output) {
                     const out = filter.push(frame.payload);
+                    mouse.watch(out);
                     guard?.watchOutput(out.toString('latin1'));
                     stdout.write(out);
                 }
                 else if (frame.type === FrameType.Console)
                     passthrough = frame.payload.toString('latin1') === 'conpty.dll';
-                else if (frame.type === FrameType.Restarting)
+                else if (frame.type === FrameType.Restarting) {
+                    mouse.reset();
                     stdout.write(MOUSE_OFF + '\x1b[2J\x1b[3J\x1b[H');
+                }
                 else if (frame.type === FrameType.Exit)
                     finish({ reason: 'exit', exitCode: frame.payload.length >= 4 ? frame.payload.readInt32LE(0) : 1 });
                 else if (frame.type === FrameType.Error)
@@ -163,9 +192,11 @@ options = {}) {
         // After setRawMode (which sets the console mode): mouse reports, focus and keys then arrive as the terminal sent
         // them.
         vtInput = enableVtInput();
+        // A helper that hangs must not hold the keyboard: after VT_WAIT_MS keys go as console keys until it is done.
+        vtTimer = setTimeout(() => write(keys.decide(false)), VT_WAIT_MS);
         void vtInput.ready.then((on) => {
-            if (on)
-                swapKeys = false;
+            clearTimeout(vtTimer);
+            write(keys.decide(on));
         });
         stdin.on('data', onInput);
         stdin.resume();

package/dist/sync/watcher.js

@@ -18,6 +18,7 @@ import { SandboxChannel } from '../host/channel/index.js';
 import { ProjectRegistry } from '../host/projects/registry.js';
 import { ContainedStorage, setNameOf, storageOf } from '../host/storage/index.js';
 import { clearSecrets } from '../host/secrets/index.js';
+import { clearLiveRecord } from '../host/engines/index.js';
 import { endSharing, sharingDeps } from '../host/sharing/index.js';
 import { PACKAGE_ROOT } from '../core/package-info.js';
 import { syncBack } from './sync-cycle.js';
@@ -137,7 +138,7 @@ export class Watcher {
     /** Contained storage of this data set (only when a mounted image is on record), else null. */
     contained() {
         try {
-            const storage = new ContainedStorage(realContainedDeps(this.storageRoot, 64), setNameOf(this.dataPath));
+            const storage = new ContainedStorage(realContainedDeps(this.storageRoot, 64, Boolean(this.resume.config)), setNameOf(this.dataPath));
             return storage.isRecorded() ? storage : null;
         }
         catch {
@@ -373,6 +374,14 @@ export class Watcher {
         catch (e) {
             this.note('could not remove the one-shot secrets: ' + errMsg(e));
         }
+        // Live folders (HCS): their shares ended with the sandbox, so their record and key go too.
+        try {
+            if (!isSandboxRunning() && clearLiveRecord(this.storageRoot, this.dataPath))
+                this.note('live folders: record cleared');
+        }
+        catch (e) {
+            this.note('could not clear the live-folder record: ' + errMsg(e));
+        }
         // An all-users install: the record of whose sandbox this was goes, and the group loses access to the folders.
         const sharing = sharingDeps(PACKAGE_ROOT);
         if (sharing)

package/dist/web/index.html

@@ -6,7 +6,7 @@
     <title>Sandbox</title>
     <link rel="icon" href="data:," />
     <link rel="stylesheet" href="/main-UAQPI5XD.css" />
-    <script type="module" src="/main-NBQ3LF4E.js"></script>
+    <script type="module" src="/main-7DJZ2M27.js"></script>
   </head>
   <body>
     <div id="root"></div>