fied 0.2.1 → 0.2.3

package/dist/bin.js

@@ -52,6 +52,22 @@ function toBase64Url(bytes) {
   }
   return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
+function fromBase64Url(str) {
+  let base64 = str.replace(/-/g, "+").replace(/_/g, "/");
+  while (base64.length % 4 !== 0) {
+    base64 += "=";
+  }
+  if (typeof atob === "function") {
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+      bytes[i] = binary.charCodeAt(i);
+    }
+    return bytes;
+  } else {
+    return new Uint8Array(Buffer.from(base64, "base64"));
+  }
+}
 
 // ../crypto/dist/protocol.js
 var IV_LENGTH2 = 12;
@@ -166,6 +182,7 @@ var DEFAULT_RELAY = "https://fied.app";
 var MSG_TERMINAL_OUTPUT = 1;
 var MSG_TERMINAL_INPUT = 2;
 var MSG_RESIZE = 3;
+var VIEWER_JOINED = "__fied_viewer_joined__";
 var RESIZE_MIN_COLS = 20;
 var RESIZE_MAX_COLS = 1e3;
 var RESIZE_MIN_ROWS = 5;
@@ -201,9 +218,9 @@ async function share(options) {
   }
   const cols = options.cols ?? process.stdout.columns ?? 80;
   const rows = options.rows ?? process.stdout.rows ?? 24;
-  const rawKey = await generateKey();
+  const rawKey = options.keyBase64Url ? fromBase64Url(options.keyBase64Url) : await generateKey();
   const cryptoKey = await importKey(rawKey);
-  const keyFragment = toBase64Url(rawKey);
+  const keyFragment = options.keyBase64Url ?? toBase64Url(rawKey);
   const pty = attachSession(targetSession, cols, rows);
   if (!options.background) {
     console.log("");
@@ -213,7 +230,7 @@ async function share(options) {
     console.log(`  Size:     ${cols}x${rows}`);
     console.log("");
   }
-  const bridge = new RelayBridge(relayTarget, cryptoKey, keyFragment, pty, options.background);
+  const bridge = new RelayBridge(relayTarget, cryptoKey, keyFragment, pty, options.background, options.sessionId);
   const onUrl = (url) => {
     if (options.background) {
       addSession({
@@ -224,6 +241,7 @@ async function share(options) {
         startedAt: (/* @__PURE__ */ new Date()).toISOString()
       });
     }
+    return options.onShareUrl?.(url);
   };
   await bridge.connect(onUrl);
   let closed = false;
@@ -290,12 +308,13 @@ async function createSession(relayHttpBase) {
 }
 var WS_CONNECT_TIMEOUT_MS = 1e4;
 var RelayBridge = class {
-  constructor(relayTarget, key, keyFragment, pty, silent = false) {
+  constructor(relayTarget, key, keyFragment, pty, silent = false, sessionId) {
     this.relayTarget = relayTarget;
     this.key = key;
     this.keyFragment = keyFragment;
     this.pty = pty;
     this.silent = silent;
+    this.sessionId = sessionId ?? null;
     this.pty.onData((data) => {
       if (this.ws?.readyState === WebSocket.OPEN) {
         this.sendEncrypted(MSG_TERMINAL_OUTPUT, this.encoder.encode(data));
@@ -327,7 +346,6 @@ var RelayBridge = class {
       }
       const shareUrl = new URL(`s/${this.sessionId}`, this.relayTarget.httpBase);
       const url = `${shareUrl.toString()}#${this.keyFragment}`;
-      this.onUrl?.(url);
       if (!this.silent) {
         console.log(`  \x1B[1mShare this link:\x1B[0m`);
         console.log(`  \x1B[4m\x1B[36m${url}\x1B[0m`);
@@ -336,6 +354,7 @@ var RelayBridge = class {
         console.log("  \x1B[2mPress Ctrl+C to stop sharing.\x1B[0m");
         console.log("");
       }
+      void this.onUrl?.(url);
     }
     const wsUrl = new URL(`api/sessions/${this.sessionId}/ws`, this.relayTarget.wsBase);
     wsUrl.searchParams.set("role", "host");
@@ -359,6 +378,8 @@ var RelayBridge = class {
         const text = this.decoder.decode(raw);
         if (text === "__fied_ping__") {
           ws.send("__fied_pong__");
+        } else if (text === VIEWER_JOINED) {
+          this.pty.write("\f");
         }
         return;
       }
@@ -543,6 +564,10 @@ if (args.includes("--__daemon")) {
       options.relay = args[++i];
     } else if (args[i] === "--allow-insecure-relay") {
       options.allowInsecureRelay = true;
+    } else if (args[i] === "--__session-id" && args[i + 1]) {
+      options.sessionId = args[++i];
+    } else if (args[i] === "--__key" && args[i + 1]) {
+      options.keyBase64Url = args[++i];
     }
   }
   share({ ...options, background: true }).catch(() => process.exit(1));
@@ -618,26 +643,66 @@ async function main() {
       session = session.split(" \u2014 ")[0].trim();
     }
   }
-  const background = await confirm("Run in background?");
-  if (background) {
-    const binPath = fileURLToPath(import.meta.url);
-    const childArgs = ["--__daemon", "--session", session];
-    if (relay) childArgs.push("--relay", relay);
-    if (allowInsecureRelay) childArgs.push("--allow-insecure-relay");
-    const child = spawnChild(process.execPath, [binPath, ...childArgs], {
-      detached: true,
-      stdio: "ignore"
-    });
-    child.unref();
-    console.error("");
-    console.error(`  \x1B[1m\x1B[32mfied\x1B[0m \u2014 started in background (PID ${child.pid})`);
-    console.error(`  Session: ${session}`);
-    console.error("  Run \x1B[1mnpx fied\x1B[0m again to manage.");
-    console.error("");
-    setTimeout(() => process.exit(0), 500);
-  } else {
-    await share({ session, relay, allowInsecureRelay });
+  if (!session) {
+    throw new Error("No tmux session selected");
   }
+  await share({
+    session,
+    relay,
+    allowInsecureRelay,
+    onShareUrl: async (url) => {
+      const background = await confirm("Run in background?");
+      if (!background) {
+        return;
+      }
+      const parsed = parseShareUrl(url);
+      const child = spawnBackground({
+        session,
+        relay,
+        allowInsecureRelay,
+        sessionId: parsed.sessionId,
+        keyBase64Url: parsed.keyBase64Url
+      });
+      console.error("");
+      console.error(`  \x1B[1m\x1B[32mfied\x1B[0m \u2014 moved to background (PID ${child.pid})`);
+      console.error(`  Session: ${session}`);
+      console.error("  Same share link stays active.");
+      console.error("  Run \x1B[1mnpx fied\x1B[0m again to manage.");
+      console.error("");
+      setTimeout(() => process.exit(0), 300);
+    }
+  });
+}
+function spawnBackground(options) {
+  const binPath = fileURLToPath(import.meta.url);
+  const childArgs = [
+    "--__daemon",
+    "--session",
+    options.session,
+    "--__session-id",
+    options.sessionId,
+    "--__key",
+    options.keyBase64Url
+  ];
+  if (options.relay) childArgs.push("--relay", options.relay);
+  if (options.allowInsecureRelay) childArgs.push("--allow-insecure-relay");
+  const child = spawnChild(process.execPath, [binPath, ...childArgs], {
+    detached: true,
+    stdio: "ignore"
+  });
+  child.unref();
+  return child;
+}
+function parseShareUrl(url) {
+  const parsed = new URL(url);
+  const match = parsed.pathname.match(/^\/s\/([A-Za-z0-9_-]{8,64})$/);
+  if (!match || !parsed.hash) {
+    throw new Error("Invalid share URL");
+  }
+  return {
+    sessionId: match[1],
+    keyBase64Url: parsed.hash.slice(1)
+  };
 }
 function timeSince(date) {
   const seconds = Math.floor((Date.now() - date.getTime()) / 1e3);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fied",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Share your tmux session in the browser with end-to-end encryption",
   "type": "module",
   "bin": {