leafrelay 0.2.5 → 0.2.6

package/dist/{chunk-OZ4FLSVP.js → chunk-FBT2UYMY.js}

@@ -160,6 +160,7 @@ var OverleafRealtimeSocket = class {
   reconnectAttempts = 0;
   reconnectTimer;
   inactivityTimer;
+  connectionAbort;
   closeTimeoutMs = 6e4;
   acknowledgementId = 0;
   acknowledgements = /* @__PURE__ */ new Map();
@@ -225,6 +226,12 @@ var OverleafRealtimeSocket = class {
     return this;
   }
   async connect() {
+    if (this.explicitlyDisconnected) {
+      return;
+    }
+    const controller = new AbortController();
+    this.connectionAbort?.abort();
+    this.connectionAbort = controller;
     try {
       this.projectJoined = false;
       const handshakeUrl = new URL("/socket.io/1/", this.endpoint.origin);
@@ -234,7 +241,8 @@ var OverleafRealtimeSocket = class {
       handshakeUrl.searchParams.set("t", String(Date.now()));
       const response = await (this.options.fetch ?? fetch)(handshakeUrl, {
         headers: { origin: this.origin, cookie: this.cookie },
-        redirect: "manual"
+        redirect: "manual",
+        signal: AbortSignal.any([controller.signal, AbortSignal.timeout(15e3)])
       });
       if (!response.ok) {
         throw new Error(`Socket.IO handshake failed: HTTP ${response.status} ${await response.text()}`);
@@ -249,22 +257,50 @@ var OverleafRealtimeSocket = class {
       const websocketUrl = new URL(`/socket.io/1/websocket/${sessionId}`, this.endpoint.origin);
       websocketUrl.protocol = websocketUrl.protocol === "https:" ? "wss:" : "ws:";
       websocketUrl.search = this.endpoint.search;
-      this.socket = new WebSocket(websocketUrl, {
+      if (controller.signal.aborted) {
+        return;
+      }
+      const socket = new WebSocket(websocketUrl, {
         headers: { origin: this.origin, cookie: this.cookie }
       });
-      this.socket.addEventListener("open", () => this.events.emit("connecting", "websocket"));
-      this.socket.addEventListener("message", (event) => void this.receive(event.data));
-      this.socket.addEventListener("error", (error2) => this.events.emit("error", error2));
-      this.socket.addEventListener("close", (event) => this.handleClose(event));
+      this.socket = socket;
+      socket.addEventListener("open", () => {
+        if (this.socket !== socket) {
+          return;
+        }
+        this.resetInactivityTimer();
+        this.events.emit("connecting", "websocket");
+      });
+      socket.addEventListener("message", (event) => {
+        if (this.socket === socket) {
+          void this.receive(event.data, socket);
+        }
+      });
+      socket.addEventListener("error", (error2) => {
+        if (this.socket === socket) {
+          this.events.emit("error", error2);
+        }
+      });
+      socket.addEventListener("close", (event) => {
+        if (this.socket === socket) {
+          this.handleClose(event);
+        }
+      });
     } catch (error2) {
+      if (controller.signal.aborted) {
+        return;
+      }
       this.events.emit("connect_failed", error2);
       this.events.emit("error", error2);
       this.scheduleReconnect();
     }
   }
-  async receive(data) {
+  async receive(data, socket) {
     this.resetInactivityTimer();
     const value = typeof data === "string" ? data : data instanceof Blob ? await data.text() : Buffer.from(data).toString("utf8");
+    if (this.socket !== socket) {
+      return;
+    }
     for (const packet of decodePayload(value)) {
       this.handlePacket(packet);
     }
@@ -339,6 +375,7 @@ var OverleafRealtimeSocket = class {
   }
   handleClose(event) {
     const wasConnected = this.connected;
+    this.socket = void 0;
     this.connected = false;
     this.projectJoined = false;
     if (this.inactivityTimer) {
@@ -353,6 +390,8 @@ var OverleafRealtimeSocket = class {
     this.scheduleReconnect();
   }
   closeSocket(reason) {
+    this.connectionAbort?.abort();
+    this.connectionAbort = void 0;
     const wasConnected = this.connected;
     this.connected = false;
     this.projectJoined = false;
@@ -381,7 +420,7 @@ var OverleafRealtimeSocket = class {
     if (!this.reconnectEnabled || this.explicitlyDisconnected || this.reconnectTimer) {
       return;
     }
-    const maxAttempts = this.options.maxReconnectionAttempts ?? 10;
+    const maxAttempts = this.options.maxReconnectionAttempts ?? Infinity;
     if (this.reconnectAttempts >= maxAttempts) {
       this.events.emit("reconnect_failed");
       return;
@@ -398,6 +437,9 @@ var OverleafRealtimeSocket = class {
   }
 };
 var sink;
+function setLogSink(nextSink) {
+  sink = nextSink;
+}
 function write(level, args) {
   if (sink !== void 0) {
     sink(level, args);
@@ -445,7 +487,7 @@ var HttpRequestScheduler = class {
   fetchImplementation;
   now;
   wait;
-  fetch(input, init) {
+  fetch(input, init, timeoutMs = this.options.requestTimeoutMs ?? 6e4) {
     const url = input instanceof Request ? input.url : String(input);
     const history = url.includes("/updates?") || url.includes("/filetree/diff?") || url.includes("/diff?");
     return this.enqueue(async () => {
@@ -459,7 +501,20 @@ var HttpRequestScheduler = class {
       if (history) {
         this.historyNextRequestAt = requestAt + this.historyIntervalMs;
       }
-      const response = await this.fetchImplementation(input, init);
+      const timeout = AbortSignal.timeout(timeoutMs);
+      const signals = [timeout, init?.signal, input instanceof Request ? input.signal : void 0].filter((signal) => Boolean(signal));
+      let response;
+      try {
+        response = await this.fetchImplementation(input, { ...init, signal: AbortSignal.any(signals) });
+      } catch (error2) {
+        const destination = new URL(url);
+        error("HTTP request failed", {
+          method: init?.method ?? (input instanceof Request ? input.method : "GET"),
+          url: `${destination.origin}${destination.pathname}`,
+          error: error2
+        });
+        throw error2;
+      }
       if (response.status === 429) {
         this.rateLimitedUntil = Math.max(
           this.rateLimitedUntil,
@@ -655,7 +710,7 @@ var BaseAPI = class {
     }
     return false;
   }
-  async request(type, route, body, callback, extraHeaders) {
+  async request(type, route, body, callback, extraHeaders, timeoutMs) {
     if (this.identity === void 0) {
       return Promise.reject();
     }
@@ -674,7 +729,7 @@ var BaseAPI = class {
                 "Cookie": this.identity.cookies,
                 ...extraHeaders
               }
-            });
+            }, timeoutMs);
             break;
           case "POST":
             const content_type = body instanceof FormData ? void 0 : { "Content-Type": "application/json" };
@@ -692,7 +747,7 @@ var BaseAPI = class {
                 ...extraHeaders
               },
               body: raw_body
-            });
+            }, timeoutMs);
             break;
           case "PUT":
             break;
@@ -706,7 +761,7 @@ var BaseAPI = class {
                 "X-Csrf-Token": this.identity.csrfToken,
                 ...extraHeaders
               }
-            });
+            }, timeoutMs);
             break;
         }
         ;
@@ -956,7 +1011,7 @@ var BaseAPI = class {
     return this.request("POST", `project/${projectId}/compile?auto_compile=true`, body, (res) => {
       const compile = JSON.parse(res);
       return { compile };
-    }, { "X-Csrf-Token": identity.csrfToken });
+    }, { "X-Csrf-Token": identity.csrfToken }, 3e5);
   }
   async stopCompile(identity, projectId) {
     this.setIdentity(identity);
@@ -2400,6 +2455,7 @@ var SyncEngine = class {
     const currentVersion = await this.options.remote.getCurrentVersion();
     const localFiles = await this.options.local.listFiles();
     const remoteFiles = this.remoteFilePaths();
+    this.options.log(`Checking replica at Overleaf version ${currentVersion}: ${localFiles.length} local file(s), ${remoteFiles.length} remote file(s).`);
     if (!this.state || !this.state.initialized) {
       await this.initializeState(currentVersion, localFiles, remoteFiles);
     } else {
@@ -2611,6 +2667,7 @@ var SyncEngine = class {
       }
     }
     let failed = false;
+    this.options.log(`Reconciling ${candidates.size} changed path(s).`);
     for (const path of [...candidates].sort()) {
       try {
         await this.reconcilePath(path, localChanged.has(path) ? "local" : "remote");
@@ -3165,6 +3222,7 @@ async function startServe(directory = process.cwd(), options = {}) {
 }
 
 export {
+  setLogSink,
   HttpRequestScheduler,
   ExtendedBaseAPI,
   SocketIOAPI,
@@ -3181,4 +3239,4 @@ export {
   RemoteProject,
   startServe
 };
-//# sourceMappingURL=chunk-OZ4FLSVP.js.map
+//# sourceMappingURL=chunk-FBT2UYMY.js.map