@steve31415/baselib 3.20.0 → 3.20.1

package/dist/sync-browser/client.d.ts

@@ -127,7 +127,11 @@ export declare class SyncClient<B, C extends EventBody, S extends EventBody, Sum
     private readonly abortControllers;
     private readonly removeListeners;
     private currentState;
+    /** Failed attempts in the current visible spell: drives the ladder and the
+     * outage log's `attempts` (what the user could have waited through). */
     private reconnectAttempts;
+    /** Failed visible attempts across the whole outage (every spell). */
+    private totalAttempts;
     private reconnectTimer;
     private countdownTimer;
     private pingTimer;

package/dist/sync-browser/client.js

@@ -47,7 +47,11 @@ export class SyncClient {
     abortControllers = new Set();
     removeListeners = [];
     currentState = { kind: 'starting', pending: 0 };
+    /** Failed attempts in the current visible spell: drives the ladder and the
+     * outage log's `attempts` (what the user could have waited through). */
     reconnectAttempts = 0;
+    /** Failed visible attempts across the whole outage (every spell). */
+    totalAttempts = 0;
     reconnectTimer = null;
     countdownTimer = null;
     pingTimer = null;
@@ -324,6 +328,10 @@ export class SyncClient {
             this.rearmFailureTimers();
             if (this.outageStartedAt !== null && !this.outageEscalated)
                 this.armEscalation();
+            // Each return starts the ladder afresh: failures from earlier glances
+            // (a phone shown for a second, often before its network is back) must
+            // not stretch this return's retry to 8-30 s or add up to a WARN.
+            this.reconnectAttempts = 0;
         }
         this.wakeConnection();
         // Always: a socket that looks open may be dead (review S2), and a
@@ -678,6 +686,7 @@ export class SyncClient {
     scheduleReconnect() {
         const delay = RECONNECT_DELAYS_SECONDS[Math.min(this.reconnectAttempts, RECONNECT_DELAYS_SECONDS.length - 1)];
         this.reconnectAttempts++;
+        this.totalAttempts++;
         if (this.reconnectAttempts >= PROBE_AFTER_ATTEMPTS)
             void this.probeSession();
         let remaining = delay;
@@ -1060,13 +1069,15 @@ export class SyncClient {
         if (this.outageStartedAt !== null) {
             const durationMs = Math.max(0, this.options.runtime.now() - this.outageStartedAt);
             // Failures are only counted (and the ladder only runs) while visible,
-            // so `attempts` is what the user could have waited through.
+            // and the count restarts on each return, so `attempts` is what the
+            // user could have waited through; `totalAttempts` spans every spell.
             const attempts = this.reconnectAttempts;
             const info = this.outageInfo;
             const delta = info ? SyncClient.delta(info.counters, this.snapshot()) : null;
             const fields = {
                 durationMs,
                 attempts,
+                totalAttempts: this.totalAttempts,
                 closeCode: info?.closeCode,
                 wasClean: info?.wasClean,
                 visibleAtDrop: info?.visibleAtDrop,
@@ -1100,6 +1111,7 @@ export class SyncClient {
             this.options.runtime.clearTimeout(this.escalateTimer);
         this.escalateTimer = null;
         this.reconnectAttempts = 0;
+        this.totalAttempts = 0;
         for (const [eventGuid, entry] of this.pending) {
             if (this.settledPending.has(eventGuid)) {
                 this.retrySettlement(eventGuid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steve31415/baselib",
-  "version": "3.20.0",
+  "version": "3.20.1",
   "description": "Plasticine new-world shared platform library: logging, auth, service-to-service auth, db, HTTP, sync, app updates",
   "type": "module",
   "license": "MIT",