@viraatdas/rudder 3.2.1 → 3.3.1

package/dist/cloud.js

@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { AttachSession, containsCtrlC } from "./attach-session.js";
+import { PasteBridge, readLocalClipboard } from "./paste-bridge.js";
 import fsp from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -2851,6 +2852,22 @@ function raceLeave(session, promise) {
         promise.then((value) => { off(); resolve(value); }, (error) => { off(); reject(error); });
     });
 }
+// One pasted file up to the home machine, through the phone's upload route.
+async function uploadPastedFile(baseUrl, token, workspaceId, file, name) {
+    const bytes = await fsp.readFile(file);
+    const url = `${baseUrl.replace(/\/$/, "")}/api/app/upload?workspace=${encodeURIComponent(workspaceId)}&name=${encodeURIComponent(name)}`;
+    const response = await fetch(url, {
+        method: "POST",
+        headers: { authorization: `Bearer ${token}`, "content-type": "application/octet-stream" },
+        body: bytes,
+        signal: AbortSignal.timeout(90_000),
+    });
+    const body = await response.json().catch(() => ({}));
+    if (!response.ok || typeof body.path !== "string") {
+        throw new Error(body.error || `HTTP ${response.status}`);
+    }
+    return body.path;
+}
 async function runAttach(target, options, sharedSession) {
     const client = await cloudClient({ requireToken: true });
     const baseUrl = client.baseUrl;
@@ -2938,6 +2955,22 @@ async function runAttach(target, options, sharedSession) {
             }
             resolve(value);
         };
+        // Files and clipboard images from this computer reach the cloud machine
+        // as uploads (src/paste-bridge.ts); only the home's repo rows take them.
+        const paste = new PasteBridge({
+            send: (data) => {
+                if (socket.readyState === WebSocket.OPEN) {
+                    socket.send(data, { binary: true });
+                    predictor?.onInput(data);
+                }
+            },
+            upload: (file, name) => uploadPastedFile(baseUrl, token, target.id, file, name),
+            readClipboard: target.kind === "workspace" && isInteractive ? readLocalClipboard : undefined,
+            status: (text) => (text ? session.showStatus(text) : session.clearStatus()),
+        });
+        if (target.kind !== "workspace") {
+            paste.disabled = true;
+        }
         let lastCtrlC = 0;
         const onStdin = (chunk) => {
             const buffer = typeof chunk === "string" ? Buffer.from(chunk, "utf8") : chunk;
@@ -2998,8 +3031,7 @@ async function runAttach(target, options, sharedSession) {
                 }
                 lastCtrlC = now;
             }
-            socket.send(buffer, { binary: true });
-            predictor?.onInput(buffer);
+            paste.forward(buffer);
         };
         const onResize = () => {
             if (hasControl) {
@@ -4188,6 +4220,9 @@ async function cloudSync(args, options) {
     const cloud = await client.request("/api/rudder/home/sync", {
         method: "POST",
         body: all || !slug ? {} : { repos: [slug], ...(work ? { work } : {}) },
+    }).catch((error) => {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(message === "fetch failed" ? "the cloud machine did not answer in time (it may be restarting); run /sync again in a minute" : message);
     }).finally(() => fsp.rm(scratch, { recursive: true, force: true }).catch(() => undefined));
     const results = cloud.results ?? [];
     // And the cloud's work comes back here.
@@ -4207,6 +4242,18 @@ async function cloudSync(args, options) {
             await fsp.rm(dir, { recursive: true, force: true }).catch(() => undefined);
         }
     }
+    // Work the other side already had was not news: report only what moved.
+    if (local?.work?.sent && mine?.report?.work?.received?.outcome === "have") {
+        delete local.work.sent;
+    }
+    if (mine?.report?.work?.sent && local?.work?.received?.outcome === "have") {
+        delete mine.report.work.sent;
+    }
+    for (const side of [local?.work, mine?.report?.work]) {
+        if (side?.received?.outcome === "have") {
+            delete side.received;
+        }
+    }
     if (local) {
         lines[0] = describeSync(`this laptop (${slug})`, local);
     }