npm - @agentunion/fastaun-browser - Versions diffs - 0.5.1 → 0.5.2 - Mend

@agentunion/fastaun-browser 0.5.1 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (50) hide show

package/dist/bundle.js CHANGED Viewed

@@ -460,7 +460,7 @@ var init_indexeddb_store = __esm({
 });
 // src/version.ts
-var VERSION = "0.5.1";
+var VERSION = "0.5.2";
 // src/types.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
@@ -3355,7 +3355,7 @@ var AgentMdManager = class _AgentMdManager {
     }
     const etags = meta.agent_md_etags;
     if (!isJsonObject(etags)) return;
-    for (const key of ["requester", "peer", "receiver", "target", "to", "sender", "from"]) {
+    for (const key of ["requester", "peer", "group", "receiver", "target", "to", "sender", "from"]) {
       const item = etags[key];
       if (!isJsonObject(item)) continue;
       await this.observeMeta(
@@ -3370,19 +3370,34 @@ var AgentMdManager = class _AgentMdManager {
     if (!isJsonObject(envelope)) return;
     if (!isJsonObject(envelope.agent_md)) return;
     const agentMd = envelope.agent_md;
-    if (!isJsonObject(agentMd.sender)) return;
-    const sender = agentMd.sender;
-    let senderAid = String(sender.aid ?? "").trim();
-    if (!senderAid) {
-      const aad = isJsonObject(envelope.aad) ? envelope.aad : {};
-      senderAid = String(aad.from ?? envelope.from ?? "").trim();
-    }
-    await this.observeMeta(
-      senderAid,
-      String(sender.etag ?? "").trim(),
-      String(sender.last_modified ?? sender.lastModified ?? "").trim(),
-      "envelope"
-    );
+    if (isJsonObject(agentMd.sender)) {
+      const sender = agentMd.sender;
+      let senderAid = String(sender.aid ?? "").trim();
+      if (!senderAid) {
+        const aad = isJsonObject(envelope.aad) ? envelope.aad : {};
+        senderAid = String(aad.from ?? envelope.from ?? "").trim();
+      }
+      await this.observeMeta(
+        senderAid,
+        String(sender.etag ?? "").trim(),
+        String(sender.last_modified ?? sender.lastModified ?? "").trim(),
+        "envelope.sender"
+      );
+    }
+    if (isJsonObject(agentMd.group)) {
+      const group = agentMd.group;
+      let groupAid = String(group.aid ?? "").trim();
+      if (!groupAid) {
+        const aad = isJsonObject(envelope.aad) ? envelope.aad : {};
+        groupAid = String(envelope.group_aid ?? envelope.group_id ?? aad.group_aid ?? aad.group_id ?? "").trim();
+      }
+      await this.observeMeta(
+        groupAid,
+        String(group.etag ?? "").trim(),
+        String(group.last_modified ?? group.lastModified ?? "").trim(),
+        "envelope.group"
+      );
+    }
   }
   eventSnapshot() {
     if (!this._localAgentMdEtag && !this._remoteAgentMdEtag) return null;
@@ -16433,6 +16448,17 @@ var MEMBERSHIP_ACTIONS = /* @__PURE__ */ new Set([
   "invite_code_used"
 ]);
 var JOIN_ACTIONS = /* @__PURE__ */ new Set(["member_added", "joined", "join_approved", "invite_code_used"]);
+function v2PullTailDelayMs(msgCount, pageLimit) {
+  const count = Math.trunc(Number(msgCount || 0));
+  const limit = Math.trunc(Number(pageLimit || 0));
+  if (count <= 0 || limit > 0 && count >= limit) return 0;
+  return Math.min(500, Math.max(5, 1e3 / (count + 1)));
+}
+function v2Sleep(ms) {
+  return new Promise((resolve) => {
+    globalThis.setTimeout(resolve, ms);
+  });
+}
 function exactArrayBuffer(bytes) {
   return bytes.slice().buffer;
 }
@@ -17066,14 +17092,21 @@ var V2E2EECoordinator = class {
     let nextAfterSeq = opts?.force ? afterSeq : afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0);
     let pageCount = 0;
     let lastAutoAckSeq = 0;
+    let pendingAckSeq = 0;
     const maxPages = 100;
     while (pageCount < maxPages) {
       pageCount += 1;
+      const ackUpToSeq = pendingAckSeq;
       const result = await client._callRawV2Rpc("message.v2.pull", {
         after_seq: nextAfterSeq,
         limit,
-        ...opts?.force ? { force: true } : {}
+        ...opts?.force ? { force: true } : {},
+        ...ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}
       });
+      if (ackUpToSeq > 0) {
+        pendingAckSeq = 0;
+        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+      }
       const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
       const messages = pageMessages.filter((msg) => {
         const seq = Number(msg.seq ?? 0);
@@ -17151,16 +17184,33 @@ var V2E2EECoordinator = class {
         }
         const ackNeeded = pageMessages.length > 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && (contigAdvanced || hasServerAckSeq && ackSeq > serverAckSeq);
         if (ackNeeded) {
-          await this.ackV2(ackSeq);
-          lastAutoAckSeq = ackSeq;
+          const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
+          const canContinuePage2 = messages.length > 0 && nextAfter2 > nextAfterSeq;
+          if (canContinuePage2) {
+            pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+          } else {
+            await this.ackV2(ackSeq);
+            lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+          }
         }
       }
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-      if (messages.length === 0 || nextAfter <= nextAfterSeq) break;
+      const rawCount = messages.length;
+      const canContinuePage = rawCount > 0 && nextAfter > nextAfterSeq;
+      const fullPage = canContinuePage && limit > 0 && rawCount >= limit;
+      const shouldContinue = canContinuePage && (fullPage || pendingAckSeq > 0);
+      if (!shouldContinue) break;
+      const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+      if (tailDelayMs > 0) await v2Sleep(tailDelayMs);
       nextAfterSeq = nextAfter;
     }
     if (pageCount >= maxPages) {
       client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
+      if (pendingAckSeq > 0) {
+        await this.ackV2(pendingAckSeq);
+        pendingAckSeq = 0;
+      }
     }
     return decrypted;
   }
@@ -17277,17 +17327,29 @@ var V2E2EECoordinator = class {
     const ownsCursor = opts?.ownsCursor !== false;
     let nextAfterSeq = opts?.explicitAfterSeq ? afterSeq : afterSeq || client._seqTracker.getContiguousSeq(ns);
     let pageCount = 0;
+    let lastAutoAckSeq = 0;
+    let pendingAckSeq = 0;
     const maxPages = 100;
     while (pageCount < maxPages) {
       pageCount += 1;
+      const ackUpToSeq = ownsCursor ? pendingAckSeq : 0;
       const result = await client._callRawV2Rpc("group.v2.pull", {
         group_id: wireGroupId,
         group_aid: gid,
         after_seq: nextAfterSeq,
         limit,
-        ...cursorParams
+        ...cursorParams,
+        ...ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}
+      });
+      if (ackUpToSeq > 0) {
+        pendingAckSeq = 0;
+        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+      }
+      const pageMessages = Array.isArray(result?.messages) ? result.messages : [];
+      const messages = pageMessages.filter((msg) => {
+        const seq = Number(msg.seq ?? 0);
+        return Number.isFinite(seq) && seq > nextAfterSeq;
       });
-      const messages = Array.isArray(result?.messages) ? result.messages : [];
       const seqs = messages.map((msg) => Number(msg.seq ?? 0)).filter((seq) => Number.isFinite(seq) && seq > 0);
       const pageContigBefore = client._seqTracker.getContiguousSeq(ns);
       const pageMaxSeq = seqs.length > 0 ? Math.max(...seqs) : nextAfterSeq;
@@ -17370,17 +17432,35 @@ var V2E2EECoordinator = class {
         client._persistSeq(ns);
       }
       const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, "current_seq");
-      const ackNeeded = messages.length > 0 && ackSeq > 0 && ownsCursor && (contigAdvanced || hasServerCursor && ackSeq > cursorCurrentSeq);
+      const ackNeeded = pageMessages.length > 0 && ackSeq > 0 && ackSeq > lastAutoAckSeq && ownsCursor && (contigAdvanced || hasServerCursor && ackSeq > cursorCurrentSeq);
       if (ackNeeded) {
-        await this.ackGroupV2(gid, ackSeq);
+        const nextAfter2 = Math.max(pageMaxSeq, nextAfterSeq);
+        const canContinuePage2 = messages.length > 0 && nextAfter2 > nextAfterSeq && ownsCursor;
+        if (canContinuePage2) {
+          pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+        } else {
+          await this.ackGroupV2(gid, ackSeq);
+          lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+        }
       }
       const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
       if (!ownsCursor) break;
-      if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false) break;
+      const rawCount = messages.length;
+      const canContinuePage = rawCount > 0 && nextAfter > nextAfterSeq;
+      const fullPage = canContinuePage && limit > 0 && rawCount >= limit;
+      const shouldContinue = canContinuePage && (fullPage || pendingAckSeq > 0);
+      if (!shouldContinue) break;
+      const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+      if (tailDelayMs > 0) await v2Sleep(tailDelayMs);
       nextAfterSeq = nextAfter;
     }
     if (pageCount >= maxPages) {
       client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
+      if (pendingAckSeq > 0) {
+        await this.ackGroupV2(gid, pendingAckSeq);
+        pendingAckSeq = 0;
+      }
     }
     return decrypted;
   }

package/dist/client/v2-e2ee.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"v2-e2ee.d.ts","sourceRoot":"","sources":["../../src/client/v2-e2ee.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiC,KAAK,UAAU,EAAkB,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7H,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,cAAc,CAAC;AAE9D,KAAK,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;~~AA4NlE~~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~~IA4HhF~~,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BzC,WAAW,CACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GAC/H,OAAO,CAAC,OAAO,CAAC;IAyEb,mBAAmB,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlG,WAAW,CACf,OAAO,EAAE,MAAM,EACf,QAAQ,SAAI,EACZ,KAAK,SAAK,EACV,IAAI,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GACxH,OAAO,CAAC,OAAO,EAAE,CAAC;~~IAuIf~~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"}
1	+ {"version":3,"file":"v2-e2ee.d.ts","sourceRoot":"","sources":["../../src/client/v2-e2ee.ts"],"names":[],"mappings":"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"}

package/dist/client/v2-e2ee.js CHANGED Viewed

@@ -21,6 +21,18 @@ const MEMBERSHIP_ACTIONS = new Set([
     'invite_code_used',
 ]);
 const JOIN_ACTIONS = new Set(['member_added', 'joined', 'join_approved', 'invite_code_used']);
+function v2PullTailDelayMs(msgCount, pageLimit) {
+    const count = Math.trunc(Number(msgCount || 0));
+    const limit = Math.trunc(Number(pageLimit || 0));
+    if (count <= 0 || (limit > 0 && count >= limit))
+        return 0;
+    return Math.min(500, Math.max(5, 1000 / (count + 1)));
+}
+function v2Sleep(ms) {
+    return new Promise((resolve) => {
+        globalThis.setTimeout(resolve, ms);
+    });
+}
 function exactArrayBuffer(bytes) {
     return bytes.slice().buffer;
 }
@@ -705,14 +717,21 @@ export class V2E2EECoordinator {
         let nextAfterSeq = opts?.force ? afterSeq : (afterSeq || (ns ? client._seqTracker.getContiguousSeq(ns) : 0));
         let pageCount = 0;
         let lastAutoAckSeq = 0;
+        let pendingAckSeq = 0;
         const maxPages = 100;
         while (pageCount < maxPages) {
             pageCount += 1;
+            const ackUpToSeq = pendingAckSeq;
             const result = await client._callRawV2Rpc('message.v2.pull', {
                 after_seq: nextAfterSeq,
                 limit,
                 ...(opts?.force ? { force: true } : {}),
+                ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
             });
+            if (ackUpToSeq > 0) {
+                pendingAckSeq = 0;
+                lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+            }
             const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
             const messages = pageMessages.filter((msg) => {
                 const seq = Number(msg.seq ?? 0);
@@ -804,17 +823,36 @@ export class V2E2EECoordinator {
                     && ackSeq > lastAutoAckSeq
                     && (contigAdvanced || (hasServerAckSeq && ackSeq > serverAckSeq));
                 if (ackNeeded) {
-                    await this.ackV2(ackSeq);
-                    lastAutoAckSeq = ackSeq;
+                    const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                    const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq;
+                    if (canContinuePage) {
+                        pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                    }
+                    else {
+                        await this.ackV2(ackSeq);
+                        lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                    }
                 }
             }
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
-            if (messages.length === 0 || nextAfter <= nextAfterSeq)
+            const rawCount = messages.length;
+            const canContinuePage = rawCount > 0 && nextAfter > nextAfterSeq;
+            const fullPage = canContinuePage && limit > 0 && rawCount >= limit;
+            const shouldContinue = canContinuePage && (fullPage || pendingAckSeq > 0);
+            if (!shouldContinue)
                 break;
+            const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+            if (tailDelayMs > 0)
+                await v2Sleep(tailDelayMs);
             nextAfterSeq = nextAfter;
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`message.v2.pull reached max_pages=${maxPages} after_seq=${nextAfterSeq}`);
+            if (pendingAckSeq > 0) {
+                await this.ackV2(pendingAckSeq);
+                pendingAckSeq = 0;
+            }
         }
         return decrypted;
     }
@@ -941,17 +979,29 @@ export class V2E2EECoordinator {
         const ownsCursor = opts?.ownsCursor !== false;
         let nextAfterSeq = opts?.explicitAfterSeq ? afterSeq : (afterSeq || client._seqTracker.getContiguousSeq(ns));
         let pageCount = 0;
+        let lastAutoAckSeq = 0;
+        let pendingAckSeq = 0;
         const maxPages = 100;
         while (pageCount < maxPages) {
             pageCount += 1;
+            const ackUpToSeq = ownsCursor ? pendingAckSeq : 0;
             const result = await client._callRawV2Rpc('group.v2.pull', {
                 group_id: wireGroupId,
                 group_aid: gid,
                 after_seq: nextAfterSeq,
                 limit,
                 ...cursorParams,
+                ...(ackUpToSeq > 0 ? { ack_up_to_seq: ackUpToSeq } : {}),
+            });
+            if (ackUpToSeq > 0) {
+                pendingAckSeq = 0;
+                lastAutoAckSeq = Math.max(lastAutoAckSeq, ackUpToSeq);
+            }
+            const pageMessages = (Array.isArray(result?.messages) ? result.messages : []);
+            const messages = pageMessages.filter((msg) => {
+                const seq = Number(msg.seq ?? 0);
+                return Number.isFinite(seq) && seq > nextAfterSeq;
             });
-            const messages = (Array.isArray(result?.messages) ? result.messages : []);
             const seqs = messages
                 .map((msg) => Number(msg.seq ?? 0))
                 .filter((seq) => Number.isFinite(seq) && seq > 0);
@@ -1040,22 +1090,43 @@ export class V2E2EECoordinator {
                 client._persistSeq(ns);
             }
             const hasServerCursor = cursor !== null && Object.prototype.hasOwnProperty.call(cursor, 'current_seq');
-            const ackNeeded = messages.length > 0
+            const ackNeeded = pageMessages.length > 0
                 && ackSeq > 0
+                && ackSeq > lastAutoAckSeq
                 && ownsCursor
                 && (contigAdvanced || (hasServerCursor && ackSeq > cursorCurrentSeq));
             if (ackNeeded) {
-                await this.ackGroupV2(gid, ackSeq);
+                const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
+                const canContinuePage = messages.length > 0 && nextAfter > nextAfterSeq && ownsCursor;
+                if (canContinuePage) {
+                    pendingAckSeq = Math.max(pendingAckSeq, ackSeq);
+                    lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                }
+                else {
+                    await this.ackGroupV2(gid, ackSeq);
+                    lastAutoAckSeq = Math.max(lastAutoAckSeq, ackSeq);
+                }
             }
             const nextAfter = Math.max(pageMaxSeq, nextAfterSeq);
             if (!ownsCursor)
                 break;
-            if (messages.length === 0 || nextAfter <= nextAfterSeq || result.has_more === false)
+            const rawCount = messages.length;
+            const canContinuePage = rawCount > 0 && nextAfter > nextAfterSeq;
+            const fullPage = canContinuePage && limit > 0 && rawCount >= limit;
+            const shouldContinue = canContinuePage && (fullPage || pendingAckSeq > 0);
+            if (!shouldContinue)
                 break;
+            const tailDelayMs = v2PullTailDelayMs(rawCount, limit);
+            if (tailDelayMs > 0)
+                await v2Sleep(tailDelayMs);
             nextAfterSeq = nextAfter;
         }
         if (pageCount >= maxPages) {
             client._clientLog.warn(`group.v2.pull reached max_pages=${maxPages} group=${gid} after_seq=${nextAfterSeq}`);
+            if (pendingAckSeq > 0) {
+                await this.ackGroupV2(gid, pendingAckSeq);
+                pendingAckSeq = 0;
+            }
         }
         return decrypted;
     }