fied 0.1.4 → 0.1.5

package/dist/bin.js

@@ -175,49 +175,66 @@ async function createSession(relay) {
   const data = await res.json();
   return data.sessionId;
 }
+var WS_CONNECT_TIMEOUT_MS = 1e4;
 var RelayBridge = class {
   constructor(relay, key, keyFragment, pty) {
     this.relay = relay;
     this.key = key;
     this.keyFragment = keyFragment;
     this.pty = pty;
+    this.pty.onData((data) => {
+      if (this.ws?.readyState === WebSocket.OPEN) {
+        this.sendEncrypted(MSG_TERMINAL_OUTPUT, this.encoder.encode(data));
+      }
+    });
   }
   ws = null;
   destroyed = false;
   backoff = RECONNECT_BASE_MS;
   reconnectTimer = null;
+  connectTimeout = null;
   encoder = new TextEncoder();
   decoder = new TextDecoder();
+  firstConnect = true;
   async connect() {
     if (this.destroyed) return;
     let sessionId;
     try {
       sessionId = await createSession(this.relay);
     } catch {
-      console.error("  \x1B[33mRelay unreachable, retrying...\x1B[0m");
+      if (this.firstConnect) {
+        console.error("  \x1B[31mRelay unreachable, retrying...\x1B[0m");
+      }
       this.scheduleReconnect();
       return;
     }
     const url = `${this.relay}/s/${sessionId}#${this.keyFragment}`;
-    console.log(`  \x1B[1mShare this link:\x1B[0m`);
-    console.log(`  \x1B[4m\x1B[36m${url}\x1B[0m`);
-    console.log("");
-    console.log("  \x1B[2mThe encryption key is in the URL fragment (#) \u2014 the server never sees it.\x1B[0m");
-    console.log("  \x1B[2mPress Ctrl+C to stop sharing.\x1B[0m");
-    console.log("");
+    if (this.firstConnect) {
+      console.log(`  \x1B[1mShare this link:\x1B[0m`);
+      console.log(`  \x1B[4m\x1B[36m${url}\x1B[0m`);
+      console.log("");
+      console.log("  \x1B[2mThe encryption key is in the URL fragment (#) \u2014 the server never sees it.\x1B[0m");
+      console.log("  \x1B[2mPress Ctrl+C to stop sharing.\x1B[0m");
+      console.log("");
+    } else {
+      console.error(`  \x1B[32mReconnected.\x1B[0m New link: \x1B[4m\x1B[36m${url}\x1B[0m`);
+    }
+    this.firstConnect = false;
     const wsUrl = this.relay.replace(/^http/, "ws") + `/api/sessions/${sessionId}/ws?role=host`;
     const ws = new WebSocket(wsUrl);
     ws.binaryType = "arraybuffer";
     this.ws = ws;
+    this.connectTimeout = setTimeout(() => {
+      if (ws.readyState !== WebSocket.OPEN) {
+        ws.terminate();
+      }
+    }, WS_CONNECT_TIMEOUT_MS);
     ws.on("open", () => {
-      this.backoff = RECONNECT_BASE_MS;
-      const resizePayload = JSON.stringify({ cols: this.pty.cols, rows: this.pty.rows });
-      this.sendEncrypted(MSG_RESIZE, this.encoder.encode(resizePayload));
-    });
-    this.pty.onData((data) => {
-      if (this.ws?.readyState === WebSocket.OPEN) {
-        this.sendEncrypted(MSG_TERMINAL_OUTPUT, this.encoder.encode(data));
+      if (this.connectTimeout) {
+        clearTimeout(this.connectTimeout);
+        this.connectTimeout = null;
       }
+      this.backoff = RECONNECT_BASE_MS;
     });
     ws.on("message", async (raw, isBinary) => {
       if (!isBinary) {
@@ -242,6 +259,10 @@ var RelayBridge = class {
       }
     });
     ws.on("close", () => {
+      if (this.connectTimeout) {
+        clearTimeout(this.connectTimeout);
+        this.connectTimeout = null;
+      }
       this.ws = null;
       if (!this.destroyed) {
         console.error("  \x1B[33mConnection lost, reconnecting...\x1B[0m");
@@ -257,6 +278,10 @@ var RelayBridge = class {
       clearTimeout(this.reconnectTimer);
       this.reconnectTimer = null;
     }
+    if (this.connectTimeout) {
+      clearTimeout(this.connectTimeout);
+      this.connectTimeout = null;
+    }
     if (this.ws) {
       this.ws.close();
       this.ws = null;

package/package.json

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