Merge branch 'main' into comments

Author: usman-khalid

blocks/canvas/ew-editor-wysiwyg/ew-editor-wysiwyg.js

@@ -46,7 +46,6 @@ export class EwEditorWysiwyg extends LitElement {
   static properties = {
     ctx: { type: Object },
     _cookieReady: { state: true },
-    _loading: { state: true },
   };
 
   connectedCallback() {
@@ -98,10 +97,8 @@ export class EwEditorWysiwyg extends LitElement {
 
   _syncCanvasVisibility() {
     const view = this._canvasActiveView ?? 'layout';
-    const portReady = this.hasAttribute(WYSIWYG_PORT_READY_ATTR);
     const showWysiwyg = view === 'layout' || view === 'split';
     this.hidden = !showWysiwyg;
-    this._loading = showWysiwyg && !portReady;
     hideSelectionToolbar();
   }
 
@@ -223,7 +220,7 @@ export class EwEditorWysiwyg extends LitElement {
       `;
     }
     return html`
-      <div class="ew-editor-wysiwyg-surface" ?hidden=${this._loading}>
+      <div class="ew-editor-wysiwyg-surface">
         ${body}
       </div>
     `;

blocks/edit/prose/index.js

@@ -31,6 +31,16 @@ import { forceSave } from './forcesave.js';
 import { createCommentsController } from './plugins/comments/helpers/controller.js';
 import { createCommentsStore } from './plugins/comments/helpers/comments-store.js';
 
+// Rapid-reconnect guard (COR-44): y-websocket resets its backoff counter on
+// every successful onopen, so a close that follows a brief successful
+// handshake reschedules at 100ms. Single users behind corporate proxies can
+// sustain thousands of WS upgrades/sec/IP through this path. The guard below
+// detects open-then-close cycles shorter than MIN_HEALTHY_SESSION_MS and
+// applies a manual exponential backoff before letting the provider reconnect.
+const MIN_HEALTHY_SESSION_MS = 5000;
+const SHORT_SESSION_BASE_MS = 1000;
+const SHORT_SESSION_MAX_MS = 30000;
+
 async function checkDoc(path) {
   return daFetch(path, { method: 'HEAD' });
 }
@@ -58,6 +68,13 @@ export async function createConnection(path) {
   provider.maxBackoffTime = 30000;
 
   let lastSentToken = token || null;
+  let lastOpenAt = 0;
+  let failedShortSessions = 0;
+
+  provider.on('status', (st) => {
+    if (st?.status === 'connected') lastOpenAt = Date.now();
+  });
+
   provider.on('connection-close', async (event) => {
     if (event?.code === 4401 || event?.code === 4403) {
       provider.shouldConnect = false;
@@ -80,6 +97,29 @@ export async function createConnection(path) {
       provider.connect();
       return;
     }
+
+    // Non-auth close: rapid-reconnect guard. y-websocket's own 100ms
+    // setTimeout(setupWS) still fires from onclose, but provider.disconnect()
+    // flips shouldConnect=false so that timer's setupWS call no-ops. The
+    // manual setTimeout below is what re-arms the connection.
+    const sessionMs = lastOpenAt ? Date.now() - lastOpenAt : 0;
+    lastOpenAt = 0;
+    if (sessionMs >= MIN_HEALTHY_SESSION_MS) {
+      failedShortSessions = 0;
+    } else {
+      const delay = Math.min(
+        2 ** failedShortSessions * SHORT_SESSION_BASE_MS,
+        SHORT_SESSION_MAX_MS,
+      );
+      failedShortSessions += 1;
+      provider.shouldConnect = false;
+      provider.disconnect();
+      setTimeout(() => {
+        provider.shouldConnect = true;
+        provider.connect();
+      }, delay);
+    }
+
     const fresh = await getAuthToken();
     provider.protocols = fresh ? ['yjs', fresh] : ['yjs'];
     lastSentToken = fresh;

blocks/sheet/sheet.js

@@ -3,7 +3,7 @@ import getPathDetails from '../shared/pathDetails.js';
 import { getNx } from '../../scripts/utils.js';
 import '../edit/da-title/da-title.js';
 import { getData } from './utils/index.js';
-import { staleCheck, showDaDialog } from './utils/utils.js';
+import { staleCheck, showDaDialog, restoreVersion } from './utils/utils.js';
 import { convertSheets } from '../edit/utils/helpers.js';
 
 const { default: getStyle } = await import(`${getNx()}/utils/styles.js`);
@@ -52,10 +52,7 @@ class DaSheetPanes extends LitElement {
     verReview.addEventListener('restore', async () => {
       const daTitle = document.querySelector('da-title');
       const daSheet = document.querySelector('.da-sheet');
-
-      const initSheet = (await import('./utils/index.js')).default;
-      daTitle.sheet = await initSheet(daSheet, verReview.data);
-      staleCheck.markSynced(verReview.data);
+      await restoreVersion(daTitle, daSheet, verReview.data);
       verReview.remove();
     });
 

blocks/sheet/utils/index.js

@@ -16,7 +16,7 @@ function resetSheets(el) {
   if (!el.jexcel) return;
   delete el.jexcel;
   el.innerHTML = '';
-  el.className = '';
+  el.classList.remove('jexcel_tabs');
 }
 
 function finishSetup(el, data) {

blocks/sheet/utils/utils.js

@@ -93,6 +93,12 @@ export const saveSheets = async (sheets) => {
 
 const debouncedSaveSheets = debounce(saveSheets, DEBOUNCE_TIME);
 
+export async function restoreVersion(daTitle, daSheet, versionData) {
+  const initSheet = (await import('./index.js')).default;
+  daTitle.sheet = await initSheet(daSheet, versionData);
+  return saveSheets(daSheet.jexcel);
+}
+
 export function handleSave(jexcel, view) {
   // markEdited must precede the config bail so config edits still mark dirty for stale-detection.
   staleCheck.markEdited();