@owlmeans/client-socket 0.1.18-rc.33 → 0.1.18-rc.35

package/build/utils/connection.js

@@ -21,12 +21,16 @@ export const makeConnection = (opts) => {
     let current = null;
     let closedByClient = false;
     let finished = false;
+    // Gave up after the budget, but still revivable — unlike `finished`, nothing here is final.
+    let lost = false;
     let attempts = 0;
     let outageStartedAt = null;
+    let outageBudget = policy.budget;
     let stableTimer = null;
     let retryTimer = null;
     let heartbeatTimer = null;
-    let lastFrameAt = Date.now();
+    // When the ping still waiting for an answer was sent, or null once anything came back.
+    let pingSentAt = null;
     let resolveReady = () => void 0;
     let rejectReady = () => void 0;
     const ready = new Promise((resolve, reject) => { resolveReady = resolve; rejectReady = reject; });
@@ -70,17 +74,22 @@ export const makeConnection = (opts) => {
         clearHeartbeat();
     };
     const startHeartbeat = (socket) => {
-        lastFrameAt = Date.now();
+        pingSentAt = null;
         heartbeatTimer = setInterval(() => {
             if (socket.readyState !== WebSocket.OPEN)
                 return;
-            if (Date.now() - lastFrameAt > policy.heartbeat + policy.pongTimeout) {
-                // Silent half-open TCP: nothing at all has arrived since well past a heartbeat interval
-                // plus its grace period — force the close this socket's own stack would eventually
+            if (pingSentAt != null && Date.now() - pingSentAt > policy.pongTimeout) {
+                // Silent half-open TCP: the ping this socket owes an answer to went out long enough ago
+                // that any live peer would have replied — force the close its own stack would eventually
                 // notice on its own, minutes later.
                 socket.close(SOCKET_HEARTBEAT_TIMEOUT_CODE);
                 return;
             }
+            // Measured from the PING rather than from the last frame: a hidden tab's timers are
+            // throttled to about one wake-up a minute, so "nothing has arrived for longer than a
+            // heartbeat interval" is what throttling looks like, not what a dead socket looks like —
+            // it used to kill a perfectly healthy backgrounded connection on every wake-up.
+            pingSentAt = Date.now();
             socket.send(JSON.stringify({ type: 'ping' }));
         }, policy.heartbeat);
     };
@@ -100,15 +109,19 @@ export const makeConnection = (opts) => {
         await emitSystem(SocketSystemEvent.Close, { code });
         settle(new SocketConnectionError('lost'));
     };
-    const scheduleReconnect = (code) => {
+    // No `Close` frame here: the connection stays revivable, and `close` means gone for good.
+    const giveUp = async () => {
+        lost = true;
+        clearTimers();
+        onStatus?.('lost');
+        await emitSystem(SocketSystemEvent.Lost, {});
+        settle(new SocketConnectionError('lost'));
+    };
+    const scheduleReconnect = () => {
         if (outageStartedAt == null)
             outageStartedAt = Date.now();
-        if (Date.now() - outageStartedAt >= policy.budget) {
-            void (async () => {
-                onStatus?.('lost');
-                await emitSystem(SocketSystemEvent.Lost, {});
-                await finish(code);
-            })();
+        if (Date.now() - outageStartedAt >= outageBudget) {
+            void giveUp();
             return;
         }
         attempts += 1;
@@ -120,22 +133,59 @@ export const makeConnection = (opts) => {
     const attemptConnect = async () => {
         if (closedByClient)
             return;
+        let socket;
         try {
-            const socket = await open();
-            onOpened(socket);
+            socket = await open();
         }
         catch {
             if (retry)
-                scheduleReconnect(1006);
+                scheduleReconnect();
             else
                 void finish(1006);
+            return;
+        }
+        if (closedByClient) {
+            // Closed while this handshake was in flight — nobody is left to own the socket.
+            socket.close(1000);
+            return;
+        }
+        onOpened(socket);
+    };
+    const revive = () => {
+        if (finished)
+            return;
+        if (lost) {
+            lost = false;
+            attempts = 1;
+            outageStartedAt = Date.now();
+            outageBudget = policy.reviveBudget;
+            onStatus?.('reconnecting');
+            void emitSystem(SocketSystemEvent.Reconnecting, { attempt: attempts, delay: 0 });
+            void attemptConnect();
+            return;
+        }
+        // Still retrying: never give up sooner than a revived connection would — otherwise a retry of
+        // its lost siblings is undone moments later when this one's older budget runs out, even by an
+        // attempt already in flight — and attempt now rather than after the backoff.
+        if (current != null)
+            return;
+        const now = Date.now();
+        if (outageStartedAt != null && outageBudget - (now - outageStartedAt) < policy.reviveBudget) {
+            outageStartedAt = now;
+            outageBudget = policy.reviveBudget;
         }
+        if (retryTimer == null)
+            return;
+        clearTimeout(retryTimer);
+        retryTimer = null;
+        void attemptConnect();
     };
     const onOpened = (socket) => {
         current = socket;
         const wasRetry = attempts > 0;
         const receiveMessage = async (event) => {
-            lastFrameAt = Date.now();
+            // Any frame at all answers the outstanding ping — the point is liveness, not pongs.
+            pingSentAt = null;
             if (typeof event.data === 'string') {
                 try {
                     if (JSON.parse(event.data)?.type === 'pong')
@@ -179,7 +229,7 @@ export const makeConnection = (opts) => {
             }
             model.stage = AuthenticationStage.Init;
             await emitSystem(SocketSystemEvent.Disconnected, { code: event.code });
-            scheduleReconnect(event.code);
+            scheduleReconnect();
         };
         socket.addEventListener('message', messageHandler);
         socket.addEventListener('close', closeHandler);
@@ -187,7 +237,11 @@ export const makeConnection = (opts) => {
         startHeartbeat(socket);
         if (stableTimer != null)
             clearTimeout(stableTimer);
-        stableTimer = setTimeout(() => { attempts = 0; outageStartedAt = null; }, policy.stableAfter);
+        stableTimer = setTimeout(() => {
+            attempts = 0;
+            outageStartedAt = null;
+            outageBudget = policy.budget;
+        }, policy.stableAfter);
         onStatus?.('online');
         settle();
         if (wasRetry)
@@ -226,6 +280,6 @@ export const makeConnection = (opts) => {
         return message;
     };
     void attemptConnect();
-    return { connection: model, ready };
+    return { connection: model, ready, revive };
 };
 //# sourceMappingURL=connection.js.map

package/build/utils/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/utils/connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/utils/connection.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-socket",
-  "version": "0.1.18-rc.33",
+  "version": "0.1.18-rc.35",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -32,15 +32,15 @@
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@owlmeans/auth": "^0.1.18-rc.30",
-    "@owlmeans/basic-envelope": "^0.1.18-rc.31",
-    "@owlmeans/basic-ids": "^0.1.18-rc.29",
-    "@owlmeans/client": "^0.1.18-rc.35",
-    "@owlmeans/client-context": "^0.1.18-rc.33",
-    "@owlmeans/client-entrypoint": "^0.1.18-rc.32",
-    "@owlmeans/context": "^0.1.18-rc.28",
-    "@owlmeans/entrypoint": "^0.1.18-rc.31",
-    "@owlmeans/socket": "^0.1.18-rc.28"
+    "@owlmeans/auth": "^0.1.18-rc.32",
+    "@owlmeans/basic-envelope": "^0.1.18-rc.33",
+    "@owlmeans/basic-ids": "^0.1.18-rc.31",
+    "@owlmeans/client": "^0.1.18-rc.37",
+    "@owlmeans/client-context": "^0.1.18-rc.35",
+    "@owlmeans/client-entrypoint": "^0.1.18-rc.34",
+    "@owlmeans/context": "^0.1.18-rc.30",
+    "@owlmeans/entrypoint": "^0.1.18-rc.33",
+    "@owlmeans/socket": "^0.1.18-rc.30"
   },
   "publishConfig": {
     "access": "public"

package/src/consts.ts

@@ -11,6 +11,7 @@ export const DEFAULT_RECONNECT_POLICY: ReconnectPolicy = {
   factor: 2,
   jitter: 0.1,
   budget: 600_000,
+  reviveBudget: 15_000,
   stableAfter: 10_000,
   heartbeat: 30_000,
   pongTimeout: 10_000,

package/src/helper.ts

@@ -10,7 +10,7 @@ import type { Config, Context, ConnectOptions, ReconnectPolicy, SocketStatusServ
 import { useContext, useValue } from '@owlmeans/client'
 import { AUTH_QUERY } from '@owlmeans/auth'
 import { entrypointUrl } from '@owlmeans/client-entrypoint/utils'
-import { useEffect, useMemo } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { createIdOfLength } from '@owlmeans/basic-ids'
 import { DEFAULT_RECONNECT_POLICY } from './consts.js'
 import { SOCKET_STATUS } from './status.js'
@@ -47,9 +47,15 @@ const establish = async (
   const status = ctx.hasService(SOCKET_STATUS)
     ? (ctx as unknown as SocketStatusServiceAppend).socketStatus() : null
 
-  const { connection, ready } = makeConnection({
-    policy, retry, open, onStatus: state => status?.report(statusId, state)
+  let opened = false
+  let lost = false
+  const managed = makeConnection({
+    policy, retry, open, onStatus: state => {
+      lost = state === 'lost'
+      status?.report(statusId, state, state === 'online' ? undefined : revive)
+    }
   })
+  const { connection, ready } = managed
 
   const baseClose = connection.close
   connection.close = async () => {
@@ -57,13 +63,22 @@ const establish = async (
     status?.release(statusId)
   }
 
-  // A rejection here means `finish()` already ran and reported this id's terminal state —
-  // `'lost'` in every case, since the budget-exhausted path is the only one that rejects
-  // `ready`. Deliberately NOT released: there is no `Connection` to hand back for a caller to
-  // close, so the aggregate stays `'lost'` — the whole reason `SocketReloadDialog` exists — until
-  // the page reloads. Only a connection this function actually returns can be released, and only
-  // by the caller closing it on purpose.
+  const revive = () => {
+    if (opened || !lost) {
+      managed.revive()
+      return
+    }
+    // Never opened, so `ws()` already rejected and nobody holds this connection to hand a revived
+    // socket to: drop it for good and leave re-dialing to its owner (`useWs` does, on `onRetry`).
+    void baseClose()
+    status?.release(statusId)
+  }
+
+  // A rejection leaves this id reporting `'lost'` rather than releasing it — there is no
+  // `Connection` to hand back for a caller to close, and the aggregate is what puts
+  // `SocketReloadDialog` up. It is released by `revive` above, on the next `retry()`.
   await ready
+  opened = true
 
   return connection
 }
@@ -107,8 +122,9 @@ export const ws = async (
  * entrypoint here at the transport boundary.
  *
  * Re-opens on its own after a network drop (see `ws()`). `null` until the first attempt opens,
- * and again once the retry budget elapses without one ever opening — a screen that must tell
- * those two apart reads `useSocketStatus()` (from `./status.js`) alongside this.
+ * and again once the retry budget elapses without one ever opening — dialed afresh on the next
+ * `SocketStatusService.retry()`. A screen that must tell those two apart reads
+ * `useSocketStatus()` (from `./status.js`) alongside this.
  */
 export const useWs = (
   module: EntrypointReference | string, request?: Partial<AbstractRequest<any>>, options?: WsOptions
@@ -118,6 +134,8 @@ export const useWs = (
     () => ctx.entrypoint<ClientEntrypoint>(module),
     [module]
   )
+  const [failed, setFailed] = useState(false)
+  const [dial, setDial] = useState(0)
   const connection = useValue<Connection | null>(async (cancel) => {
     const _request = provideRequest(mod.alias, mod.path())
     Object.assign(_request, request)
@@ -132,14 +150,24 @@ export const useWs = (
       }
       return conn
     } catch {
+      if (!cancel?.current) setFailed(true)
       return null
     }
   }, [
     mod.alias,
     request?.query?.[AUTH_QUERY],
-    request?.params ? JSON.stringify(request.params) : undefined
+    request?.params ? JSON.stringify(request.params) : undefined,
+    dial
   ])
 
+  useEffect(() => {
+    if (!failed || !ctx.hasService(SOCKET_STATUS)) return
+    return (ctx as unknown as SocketStatusServiceAppend).socketStatus().onRetry(() => {
+      setFailed(false)
+      setDial(n => n + 1)
+    })
+  }, [failed])
+
   useEffect(() => {
     if (connection != null) {
       return () => {

package/src/status.ts

@@ -1,6 +1,6 @@
 import { createService } from '@owlmeans/context'
 import { useContext } from '@owlmeans/client'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import type {
   Config, Context, SocketConnectionState, SocketStatusService, SocketStatusServiceAppend
 } from './types.js'
@@ -17,7 +17,9 @@ const RANK: Record<SocketConnectionState, number> = { online: 0, reconnecting: 1
  */
 export const createSocketStatusService = (alias: string = SOCKET_STATUS): SocketStatusService => {
   const states = new Map<string, SocketConnectionState>()
+  const revivers = new Map<string, () => void>()
   const listeners = new Set<(state: SocketConnectionState) => void>()
+  const retryListeners = new Set<() => void>()
   let current: SocketConnectionState = 'online'
 
   const recompute = () => {
@@ -31,15 +33,49 @@ export const createSocketStatusService = (alias: string = SOCKET_STATUS): Socket
     }
   }
 
+  // Connections still retrying are nudged too, so one whose older budget is about to run out does
+  // not report `'lost'` right after its lost siblings were revived.
+  const retry = (): boolean => {
+    const pending = [...states].filter(([, state]) => state !== 'online')
+    pending.forEach(([id]) => revivers.get(id)?.())
+    if (!pending.some(([, state]) => state === 'lost')) return false
+    retryListeners.forEach(listener => listener())
+    return true
+  }
+
+  // A backgrounded tab is where sockets die unnoticed (throttled timers, a sleeping machine), so
+  // the moment it is looked at again is the moment to retry — before anyone reaches for a button.
+  const watchActivation = () => {
+    if (typeof document === 'undefined' || typeof window === 'undefined') return
+    document.addEventListener('visibilitychange', () => {
+      if (document.visibilityState === 'visible') retry()
+    })
+    window.addEventListener('focus', () => { retry() })
+    window.addEventListener('online', () => { retry() })
+  }
+
   return createService<SocketStatusService>(alias, {
-    report: (id, state) => { states.set(id, state); recompute() },
-    release: (id) => { states.delete(id); recompute() },
+    report: (id, state, revive) => {
+      states.set(id, state)
+      if (revive != null) revivers.set(id, revive)
+      else revivers.delete(id)
+      recompute()
+    },
+    release: (id) => { states.delete(id); revivers.delete(id); recompute() },
     state: () => current,
     subscribe: listener => {
       listeners.add(listener)
       return () => { listeners.delete(listener) }
     },
-  }, service => async () => { service.initialized = true })
+    retry,
+    onRetry: listener => {
+      retryListeners.add(listener)
+      return () => { retryListeners.delete(listener) }
+    },
+  }, service => async () => {
+    watchActivation()
+    service.initialized = true
+  })
 }
 
 /**
@@ -74,35 +110,55 @@ const readSocketStatusService = (
   }
 }
 
+/** The status service once the context can hand it out; `null` while it cannot, or never will. */
+const useStatusService = (): SocketStatusService | null => {
+  const ctx = useContext() as unknown as Context & Partial<SocketStatusServiceAppend>
+  const [service, setService] = useState<SocketStatusService | null>(() => readSocketStatusService(ctx))
+
+  useEffect(() => {
+    if (service != null) return
+    let cancelled = false
+    void ctx.waitForInitialized?.().then(() => { if (!cancelled) setService(readSocketStatusService(ctx)) })
+    return () => { cancelled = true }
+  }, [ctx, service])
+
+  return service
+}
+
 /**
  * The worst state across every live `ws()`/`useWs()` connection, or `'online'` if the app never
  * registered the status service (`appendSocketStatus`) or has not finished initializing yet.
  */
 export const useSocketStatus = (): SocketConnectionState => {
-  const ctx = useContext() as unknown as Context & Partial<SocketStatusServiceAppend>
-  const [state, setState] = useState<SocketConnectionState>(() => readSocketStatusService(ctx)?.state() ?? 'online')
+  const service = useStatusService()
+  const [state, setState] = useState<SocketConnectionState>(() => service?.state() ?? 'online')
 
   useEffect(() => {
-    let cancelled = false
-    let unsubscribe: (() => void) | null = null
-
-    const attach = (): boolean => {
-      const service = readSocketStatusService(ctx)
-      if (service == null) return false
-      setState(service.state())
-      unsubscribe = service.subscribe(next => { if (!cancelled) setState(next) })
-      return true
-    }
+    if (service == null) return
+    setState(service.state())
+    return service.subscribe(setState)
+  }, [service])
 
-    if (!attach()) {
-      void ctx.waitForInitialized?.().then(() => { if (!cancelled) attach() })
-    }
+  return state
+}
 
-    return () => {
-      cancelled = true
-      unsubscribe?.()
-    }
-  }, [ctx])
+/**
+ * `retry` revives every lost connection now (`SocketStatusService.retry()`); `retrying` is true
+ * from any retry — this one, or the service's own on tab activation — until the aggregate settles
+ * back on `'online'` or `'lost'`.
+ */
+export const useSocketRetry = (): { retry: () => void, retrying: boolean } => {
+  const service = useStatusService()
+  const [retrying, setRetrying] = useState(false)
 
-  return state
+  useEffect(() => {
+    if (service == null) return
+    const stopRetry = service.onRetry(() => setRetrying(service.state() === 'reconnecting'))
+    const stopState = service.subscribe(state => { if (state !== 'reconnecting') setRetrying(false) })
+    return () => { stopRetry(); stopState() }
+  }, [service])
+
+  const retry = useCallback(() => { service?.retry() }, [service])
+
+  return { retry, retrying }
 }

package/src/types.ts

@@ -32,6 +32,10 @@ export interface ReconnectPolicy {
   /** Total time, in ms, the carrier keeps retrying before it reports the socket lost. Default
    *  600000 (10 minutes). */
   budget: number
+  /** Retry window, in ms, of an outage restarted on a lost socket by `SocketStatusService.retry()`
+   *  (a "Try again" press, the tab coming back) — short, so a retry that cannot succeed reports
+   *  `'lost'` again while someone is still looking. Default 15000. */
+  reviveBudget: number
   /** How long a reopened socket must stay open before the attempt count and the outage clock
    *  reset, in ms. Default 10000. */
   stableAfter: number
@@ -65,13 +69,20 @@ export interface WsOptions extends ConnectOptions {
 export type SocketConnectionState = 'online' | 'reconnecting' | 'lost'
 
 export interface SocketStatusService extends InitializedService {
-  /** Record this connection's current state under `id` — call again to update it. */
-  report: (id: string, state: SocketConnectionState) => void
+  /** Record this connection's current state under `id` — call again to update it. `revive` is
+   *  how `retry()` brings it back (`'lost'`) or hurries it (`'reconnecting'`); every report
+   *  replaces the previous one. */
+  report: (id: string, state: SocketConnectionState, revive?: () => void) => void
   /** Stop tracking `id` (the connection closed on purpose). */
   release: (id: string) => void
   /** The worst state across every tracked connection; `'online'` when none are tracked. */
   state: () => SocketConnectionState
   subscribe: (listener: (state: SocketConnectionState) => void) => () => void
+  /** Revive every `'lost'` connection and hurry every `'reconnecting'` one, then tell `onRetry`
+   *  listeners. `false` (and no listener call) when nothing was lost. Also fires by itself when a
+   *  browser tab becomes visible, its window gains focus, or the network comes back online. */
+  retry: () => boolean
+  onRetry: (listener: () => void) => () => void
 }
 
 export interface SocketStatusServiceAppend {