@floegence/flowersec-core 0.19.6 → 0.19.7

package/dist/proxy/controllerGuard.js

@@ -116,18 +116,19 @@ async function uninstallConflictingServiceWorkers(targetWindow, conflicts) {
         }
     }
 }
-function triggerRepairNavigation(navigationWindow, repair) {
+function triggerRepairNavigation(navigationWindow, repair, attempt) {
     const queryKey = String(repair?.queryKey ?? "_flowersec_sw_repair").trim() || "_flowersec_sw_repair";
     const maxAttempts = Math.max(0, Math.floor(repair?.maxAttempts ?? 2));
     const strategy = repair?.strategy ?? "replace";
-    const attempt = parseRepairAttemptFromHref(navigationWindow.location.href, queryKey);
-    if (attempt >= maxAttempts)
+    const hrefAttempt = parseRepairAttemptFromHref(navigationWindow.location.href, queryKey);
+    const effectiveAttempt = Math.max(attempt, hrefAttempt);
+    if (effectiveAttempt >= maxAttempts)
         return false;
     if (strategy === "reload") {
         navigationWindow.location.reload();
         return true;
     }
-    const next = buildHrefWithRepairAttempt(navigationWindow.location.href, queryKey, attempt + 1);
+    const next = buildHrefWithRepairAttempt(navigationWindow.location.href, queryKey, effectiveAttempt + 1);
     navigationWindow.location.replace(next);
     return true;
 }
@@ -144,6 +145,7 @@ export function createServiceWorkerControllerGuard(opts) {
     let disposed = false;
     let monitorHandler = null;
     let lastMonitorRepairAt = 0;
+    let repairAttempts = 0;
     const handleMismatch = async (stage) => {
         const actualScriptURL = String(getServiceWorker(targetWindow)?.controller?.scriptURL ?? "").trim();
         const ctx = {
@@ -155,7 +157,10 @@ export function createServiceWorkerControllerGuard(opts) {
         if (action === "ignore")
             return "ignored";
         await uninstallConflictingServiceWorkers(targetWindow, opts.conflicts);
-        return triggerRepairNavigation(navigationWindow, opts.repair) ? "repaired" : "skipped";
+        const repaired = triggerRepairNavigation(navigationWindow, opts.repair, repairAttempts);
+        if (repaired)
+            repairAttempts += 1;
+        return repaired ? "repaired" : "skipped";
     };
     const attachMonitor = () => {
         if (!monitorEnabled || monitorHandler != null)

package/dist/reconnect/index.js

@@ -1,4 +1,4 @@
-import { withObserverContext } from "../observability/observer.js";
+import { emitObserverDiagnostic, withObserverContext } from "../observability/observer.js";
 function normalizeAutoReconnect(cfg) {
     if (!cfg?.enabled) {
         return {
@@ -178,6 +178,13 @@ export function createReconnectManager() {
                 return;
             attempts += 1;
             attemptSeq += 1;
+            emitObserverDiagnostic(withObserverContext(cfg.observer, { attemptSeq }), {
+                path: "auto",
+                stage: "reconnect",
+                code_domain: "event",
+                code: attempts === 1 ? "reconnect_attempt" : "reconnect_retry_attempt",
+                result: "retry",
+            });
             try {
                 const client = await connectOnce(t, cfg, attemptSeq);
                 if (t !== token) {
@@ -199,6 +206,13 @@ export function createReconnectManager() {
                     return;
                 }
                 setState({ status: "connected", client, error: null });
+                emitObserverDiagnostic(withObserverContext(cfg.observer, { attemptSeq }), {
+                    path: "auto",
+                    stage: "reconnect",
+                    code_domain: "event",
+                    code: "reconnect_connected",
+                    result: "ok",
+                });
                 return;
             }
             catch (err) {
@@ -210,10 +224,24 @@ export function createReconnectManager() {
                 const canRetry = ar.enabled && attempts < ar.maxAttempts;
                 if (!canRetry) {
                     setState({ status: "error", error: e, client: null });
+                    emitObserverDiagnostic(withObserverContext(cfg.observer, { attemptSeq }), {
+                        path: "auto",
+                        stage: "reconnect",
+                        code_domain: "event",
+                        code: "reconnect_exhausted",
+                        result: "fail",
+                    });
                     throw e;
                 }
                 setState({ status: "connecting", error: e, client: null });
                 const delay = backoffDelayMs(attempts - 1, ar);
+                emitObserverDiagnostic(withObserverContext(cfg.observer, { attemptSeq }), {
+                    path: "auto",
+                    stage: "reconnect",
+                    code_domain: "event",
+                    code: "reconnect_scheduled",
+                    result: "retry",
+                });
                 await sleep(delay);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/flowersec-core",
-  "version": "0.19.6",
+  "version": "0.19.7",
   "description": "Flowersec core TypeScript library (browser-friendly E2EE + multiplexing over WebSocket).",
   "license": "MIT",
   "repository": {