@swimmesberger/elarion-jsonrpc-client-generator 0.2.22-preview.190.1 → 0.3.0

package/README.md

@@ -87,7 +87,9 @@ When the schema carries an `events` block (the host registers Elarion client-eve
 additionally emits `events-client.ts`: `createElarionEvents(...)` multiplexes topic-typed subscriptions over one
 `EventSource`, validates incoming payloads with the generated Zod schemas (`rpcEventPayloadSchemas`), and exposes
 `$client.onConnected(...)` — fired on connect and every reconnect — as the "you may have missed events, re-query"
-signal. Event-free schemas produce byte-identical output with no events file.
+signal. The platform `EventSource` stops retrying when an answer is not a 200 event stream (a 401, a login page, a
+502 during a restart), so the client reopens such a connection itself, backing off from 1 s to 30 s
+(`reconnectDelay`). Event-free schemas produce byte-identical output with no events file.
 
 ```ts
 import { createElarionEvents } from './generated/events-client'

package/dist/events-client-source.js

@@ -23,6 +23,8 @@ export function generateEventsClientSource(options) {
         'export interface ElarionEventSourceLike {',
         '  addEventListener(type: string, listener: (event: { readonly data?: unknown }) => void): void',
         '  close(): void',
+        '  // 2 (CLOSED) once the source gave up for good; a source without it is never reconnected by the client.',
+        '  readonly readyState?: number',
         '}',
         '',
         'export type ElarionEventSourceFactory = (url: string) => ElarionEventSourceLike',
@@ -35,6 +37,9 @@ export function generateEventsClientSource(options) {
         '  readonly validateEvents?: boolean',
         '  // Called when an incoming event cannot be parsed or validated; the event is dropped either way.',
         '  readonly onEventError?: (topic: RpcEventTopic, error: unknown) => void',
+        '  // Milliseconds to wait before reopening a connection the platform EventSource gave up on, by attempt',
+        '  // (0-based, reset by every elarion.connected). Defaults to 1 s doubling up to 30 s.',
+        '  readonly reconnectDelay?: (attempt: number) => number',
         '}',
         '',
         'export interface ElarionEventSubscribeOptions {',
@@ -76,6 +81,8 @@ export function generateEventsClientSource(options) {
         '] as const satisfies readonly RpcEventTopic[]',
         '',
         "const CONNECTED_EVENT_TYPE = 'elarion.connected'",
+        '// EventSource.CLOSED — a literal, so the client needs no EventSource global to compare against.',
+        'const EVENT_SOURCE_CLOSED = 2',
         '',
         'interface EventSubscriptionEntry {',
         '  readonly topic: RpcEventTopic',
@@ -102,11 +109,14 @@ export function generateEventsClientSource(options) {
         'export function createElarionEventsClient(options: ElarionEventsOptions): ElarionEventsClient {',
         '  const createSource = options.eventSource ?? defaultEventSourceFactory',
         '  const validateEvents = options.validateEvents ?? true',
+        '  const reconnectDelay = options.reconnectDelay ?? defaultReconnectDelay',
         '',
         '  const subscriptions = new Map<string, EventSubscriptionEntry>()',
         '  const connectedHandlers = new Set<() => void>()',
         '  let source: ElarionEventSourceLike | undefined',
         '  let reconnectScheduled = false',
+        '  let retryTimer: ReturnType<typeof setTimeout> | undefined',
+        '  let failedAttempts = 0',
         '  let closed = false',
         '',
         '  // Subscription changes coalesce onto a microtask, so subscribing N topics during setup opens one',
@@ -120,7 +130,25 @@ export function generateEventsClientSource(options) {
         '    })',
         '  }',
         '',
+        '  // The platform EventSource retries a dropped connection by itself, but fails it for good (readyState',
+        '  // CLOSED, no further retries) when the answer is not a 200 event stream: an expired session\'s 401 or',
+        '  // login page, a 502 while the server restarts. Without a retry here the client would stay silent until',
+        '  // the page reloads.',
+        '  function scheduleRetry(): void {',
+        '    if (retryTimer !== undefined || closed) return',
+        '    const delay = reconnectDelay(failedAttempts)',
+        '    failedAttempts += 1',
+        '    retryTimer = setTimeout(() => {',
+        '      retryTimer = undefined',
+        '      if (!closed) connect()',
+        '    }, delay)',
+        '  }',
+        '',
         '  function connect(): void {',
+        '    if (retryTimer !== undefined) {',
+        '      clearTimeout(retryTimer)',
+        '      retryTimer = undefined',
+        '    }',
         '    source?.close()',
         '    source = undefined',
         '    if (subscriptions.size === 0) return',
@@ -134,8 +162,12 @@ export function generateEventsClientSource(options) {
         '      next.addEventListener(topic, (event) => dispatch(topic, event))',
         '    }',
         '    next.addEventListener(CONNECTED_EVENT_TYPE, () => {',
+        '      failedAttempts = 0',
         '      for (const handler of [...connectedHandlers]) handler()',
         '    })',
+        "    next.addEventListener('error', () => {",
+        '      if (source === next && next.readyState === EVENT_SOURCE_CLOSED) scheduleRetry()',
+        '    })',
         '    source = next',
         '  }',
         '',
@@ -208,6 +240,8 @@ export function generateEventsClientSource(options) {
         '    },',
         '    close(): void {',
         '      closed = true',
+        '      if (retryTimer !== undefined) clearTimeout(retryTimer)',
+        '      retryTimer = undefined',
         '      source?.close()',
         '      source = undefined',
         '      subscriptions.clear()',
@@ -216,6 +250,10 @@ export function generateEventsClientSource(options) {
         '  }',
         '}',
         '',
+        'function defaultReconnectDelay(attempt: number): number {',
+        '  return Math.min(30_000, 1_000 * 2 ** attempt)',
+        '}',
+        '',
         'function defaultEventSourceFactory(url: string): ElarionEventSourceLike {',
         '  const ctor = (globalThis as { EventSource?: new (url: string) => ElarionEventSourceLike }).EventSource',
         '  if (!ctor) {',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swimmesberger/elarion-jsonrpc-client-generator",
-  "version": "0.2.22-preview.190.1",
+  "version": "0.3.0",
   "description": "Generate TypeScript RPC contracts, Zod schemas, and a fetch client from Elarion JSON-RPC schema exports.",
   "license": "Apache-2.0",
   "type": "module",