@fileverse-dev/dsheet 2.1.3-rtc-debug-3 → 2.1.3-rtc-debug-4

package/dist/{index-DGDfkhOR.js → index-DRDqGVKo.js}

@@ -47106,13 +47106,13 @@ class kE {
   }
   async syncLatestCommit(t) {
     await this.withRetry(async () => {
-      var c, d, h, p, m, g, w, S, b, v;
+      var d, h, p, m, g, w, S, b, v, y;
       console.log("[RTC] syncLatestCommit: fetchLatestCommit() start");
-      const n = await ((c = this.socketClient) == null ? void 0 : c.fetchLatestCommit());
+      const n = await ((d = this.socketClient) == null ? void 0 : d.fetchLatestCommit());
       console.log("[RTC] syncLatestCommit: fetchLatestCommit() done", {
-        hasHistory: !!((h = (d = n == null ? void 0 : n.data) == null ? void 0 : d.history) != null && h.length)
+        hasHistory: !!((p = (h = n == null ? void 0 : n.data) == null ? void 0 : h.history) != null && p.length)
       });
-      const o = (m = (p = n == null ? void 0 : n.data) == null ? void 0 : p.history) == null ? void 0 : m[0];
+      const o = (g = (m = n == null ? void 0 : n.data) == null ? void 0 : m.history) == null ? void 0 : g[0];
       let r;
       if (o != null && o.data)
         try {
@@ -47120,63 +47120,81 @@ class kE {
             this.roomKeyBytes,
             o.data
           );
-        } catch (y) {
+        } catch (C) {
           console.warn(
             "[RTC] syncLatestCommit: failed to decrypt commit data (bad roomKey?), skipping",
-            y
+            C
           );
         }
       const s = [];
-      if (o != null && o.cid && ((g = this.servicesRef) != null && g.fetchFromStorage)) {
+      if (o != null && o.cid && ((w = this.servicesRef) != null && w.fetchFromStorage)) {
         console.log("[RTC] syncLatestCommit: fetchFromStorage() start", {
           cid: o.cid
         });
-        const y = await this.servicesRef.fetchFromStorage(o.cid);
+        const C = await this.servicesRef.fetchFromStorage(o.cid);
         if (console.log("[RTC] syncLatestCommit: fetchFromStorage() done", {
-          hasData: !!(y != null && y.data)
-        }), y != null && y.data)
+          hasData: !!(C != null && C.data)
+        }), C != null && C.data)
           try {
-            const C = On.decryptData(
+            const k = On.decryptData(
               this.roomKeyBytes,
-              y.data
+              C.data
             );
-            s.push(C);
-          } catch (C) {
+            s.push(k);
+          } catch (k) {
             console.warn(
               "[RTC] syncLatestCommit: failed to decrypt commit content (bad roomKey?), skipping",
-              C
+              k
             );
           }
       }
       console.log("[RTC] syncLatestCommit: getUncommittedChanges() start");
-      const a = await ((w = this.socketClient) == null ? void 0 : w.getUncommittedChanges());
+      const a = await ((S = this.socketClient) == null ? void 0 : S.getUncommittedChanges());
       console.log("[RTC] syncLatestCommit: getUncommittedChanges() done", {
-        count: ((b = (S = a == null ? void 0 : a.data) == null ? void 0 : S.history) == null ? void 0 : b.length) ?? 0
+        count: ((v = (b = a == null ? void 0 : a.data) == null ? void 0 : b.history) == null ? void 0 : v.length) ?? 0
       });
-      const i = (v = a == null ? void 0 : a.data) == null ? void 0 : v.history, l = [];
-      if (t && s.push(yo(t)), r && s.push(r), i && i.length > 0) {
+      const i = (y = a == null ? void 0 : a.data) == null ? void 0 : y.history, l = [];
+      t && s.push(yo(t)), r && s.push(r);
+      let f = 0;
+      if (i && i.length > 0) {
         this.isOwner && this.send({ type: "SET_UNMERGED_UPDATES", hasUpdates: !0 });
-        for (const y of i)
+        for (const C of i)
           try {
-            const C = On.decryptData(
+            const k = On.decryptData(
               this.roomKeyBytes,
-              y.data
+              C.data
             );
-            l.push(y.id), s.push(C);
-          } catch (C) {
-            console.warn(
-              "SyncManager: failed to decrypt uncommitted update, skipping",
-              C
+            l.push(C.id), s.push(k);
+          } catch (k) {
+            f++, console.warn(
+              "[RTC] syncLatestCommit: failed to decrypt uncommitted update, skipping",
+              k
             );
           }
+        console.log("[RTC] syncLatestCommit: uncommitted update decrypt tally", {
+          total: i.length,
+          failed: f,
+          succeeded: i.length - f
+        });
       }
-      if (s.length) {
-        const y = He.mergeUpdates(s);
-        He.applyUpdate(this.ydoc, y, "self");
+      if (console.log("[RTC] syncLatestCommit: ydoc share keys BEFORE merge apply", {
+        keys: Array.from(this.ydoc.share.keys()),
+        updatesToMergeCount: s.length
+      }), s.length) {
+        const C = He.mergeUpdates(s);
+        He.applyUpdate(this.ydoc, C, "self");
       }
-      this.uncommittedUpdatesIdList = l;
-      const f = Eo(He.encodeStateAsUpdate(this.ydoc));
-      this.isOwner ? (console.log("[RTC] syncLatestCommit: commitLocalContents() start"), await this.commitLocalContents(l, f), console.log("[RTC] syncLatestCommit: commitLocalContents() done")) : (console.log("[RTC] syncLatestCommit: broadcastLocalContents() start"), await this.broadcastLocalContents(f), console.log("[RTC] syncLatestCommit: broadcastLocalContents() done"));
+      console.log("[RTC] syncLatestCommit: ydoc share keys AFTER merge apply", {
+        keys: Array.from(this.ydoc.share.keys()).map((C) => {
+          var k;
+          return {
+            key: C,
+            length: (k = this.ydoc.share.get(C)) == null ? void 0 : k.length
+          };
+        })
+      }), this.uncommittedUpdatesIdList = l;
+      const c = Eo(He.encodeStateAsUpdate(this.ydoc));
+      this.isOwner ? (console.log("[RTC] syncLatestCommit: commitLocalContents() start"), await this.commitLocalContents(l, c), console.log("[RTC] syncLatestCommit: commitLocalContents() done")) : (console.log("[RTC] syncLatestCommit: broadcastLocalContents() start"), await this.broadcastLocalContents(c), console.log("[RTC] syncLatestCommit: broadcastLocalContents() done"));
     }, "syncLatestCommit");
   }
   initializeAwareness() {
@@ -49162,8 +49180,16 @@ const tT = (e, t, n, o, r, s = !1, a, i, l, f, c, d = !1, h, p, m, g, w = !1) =>
       alreadyInitialized: P.current
     }), !(!g || !e.current || !t) && !P.current)
       try {
+        console.log("[RTC] use-editor-data: reading ydoc.getArray(dsheetId)", {
+          dsheetId: t,
+          allShareKeys: Array.from(e.current.share.keys())
+        });
         const L = e.current.getArray(t);
-        Tu(e.current, L);
+        console.log("[RTC] use-editor-data: sheetArray length BEFORE migrate", {
+          length: L.length
+        }), Tu(e.current, L), console.log("[RTC] use-editor-data: sheetArray length AFTER migrate", {
+          length: L.length
+        });
         const A = zo(L);
         C.current = A, I(A);
         const U = {};
@@ -51411,7 +51437,7 @@ const Dr = ({
     }, w.readAsText(h);
   });
 }, hm = async (e, t, n, o) => {
-  const { handleExportToXLSX: r } = await import("./xlsx-export-impl-DIpQaIgT.js");
+  const { handleExportToXLSX: r } = await import("./xlsx-export-impl-fSEKx8cP.js");
   return r(e, t, n, o);
 }, kT = (e) => {
   var n;
@@ -51486,7 +51512,7 @@ const Dr = ({
   const [a, i] = Re(!1);
   return { handleXLSXUpload: Ee(
     async (f, c, d) => {
-      const { runXlsxFileUpload: h } = await import("./use-xlsx-import-impl-Caq6017s.js");
+      const { runXlsxFileUpload: h } = await import("./use-xlsx-import-impl-fZX_vLfm.js");
       return h(
         {
           sheetEditorRef: e,

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { S as s, a as o, i as t, T as r, b as l, d as n, e as d, f as i, g as S, h as c, j as h, k as m, l as p, n as u, o as C, p as E, q as g, r as F, s as x, t as R, u as f, v as L, w as b, x as w, z as A, A as T, B as v, C as I, D, E as M, F as V, G as k } from "./index-DGDfkhOR.js";
+import { S as s, a as o, i as t, T as r, b as l, d as n, e as d, f as i, g as S, h as c, j as h, k as m, l as p, n as u, o as C, p as E, q as g, r as F, s as x, t as R, u as f, v as L, w as b, x as w, z as A, A as T, B as v, C as I, D, E as M, F as V, G as k } from "./index-DRDqGVKo.js";
 import { bP as z, bQ as X, bR as _, bV as y, bg as B, e as G, f as O, h as U, a as j, cf as q, aq as H, cm as J } from "./executeStringFunction-BkmJj04p.js";
 import { FLVURL as N } from "@fileverse-dev/formulajs";
 import { E as Y, S as Z } from "./constants-yStXQJiK.js";

package/dist/{use-xlsx-import-impl-Caq6017s.js → use-xlsx-import-impl-fZX_vLfm.js}

@@ -1,6 +1,6 @@
 import { g as Ue } from "./executeStringFunction-BkmJj04p.js";
 import * as qe from "yjs";
-import { m as Xe, y as Ze } from "./index-DGDfkhOR.js";
+import { m as Xe, y as Ze } from "./index-DRDqGVKo.js";
 import { n as Je } from "./xlsx-hyperlink-inline-DzewAypN.js";
 import { toast as Be } from "@fileverse/ui";
 var We = { exports: {} };

package/dist/{xlsx-export-impl-DIpQaIgT.js → xlsx-export-impl-fSEKx8cP.js}

@@ -3,7 +3,7 @@ import { Workbook as Pt } from "exceljs";
 import { toast as Ut } from "@fileverse/ui";
 import { addFortuneImagesToWorksheet as Lt } from "./xlsx-image-utils-Cvg0qxRA.js";
 import { g as jt, c as xt } from "./executeStringFunction-BkmJj04p.js";
-import { c as Ct } from "./index-DGDfkhOR.js";
+import { c as Ct } from "./index-DRDqGVKo.js";
 import { c as zt, g as Wt } from "./xlsx-hyperlink-inline-DzewAypN.js";
 const Mt = {
   1: "thin",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/dsheet",
   "private": false,
   "description": "DSheet",
-  "version": "2.1.3-rtc-debug-3",
+  "version": "2.1.3-rtc-debug-4",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {