@floegence/floe-webapp-protocol 0.15.0 → 0.15.2

package/dist/client.d.ts

@@ -1,11 +1,8 @@
 import { type JSX } from 'solid-js';
 import type { ChannelInitGrant, Client, ClientObserverLike, DirectConnectInfo } from '@floegence/flowersec-core';
+import { type AutoReconnectConfig, type ConnectionStatus } from '@floegence/flowersec-core/reconnect';
 import { type ControlplaneConfig } from './controlplane';
 import type { ProtocolContract } from './contract';
-/**
- * Connection status
- */
-export type ConnectionStatus = 'disconnected' | 'connecting' | 'connected' | 'error';
 interface ProtocolContextValue {
     status: () => ConnectionStatus;
     error: () => Error | null;
@@ -14,26 +11,7 @@ interface ProtocolContextValue {
     connect: (config: ConnectConfig) => Promise<void>;
     disconnect: () => void;
 }
-/**
- * Configuration for connecting to a flowersec server
- */
-export interface AutoReconnectConfig {
-    /**
-     * Enable auto reconnect on failure / unexpected disconnect.
-     * Default: false.
-     */
-    enabled?: boolean;
-    /** Maximum total attempts (including the first). Default: 5. */
-    maxAttempts?: number;
-    /** Base delay for the first retry. Default: 500ms. */
-    initialDelayMs?: number;
-    /** Max delay cap. Default: 10s. */
-    maxDelayMs?: number;
-    /** Exponential backoff factor. Default: 1.8. */
-    factor?: number;
-    /** Random jitter ratio in [-ratio, +ratio]. Default: 0.2. */
-    jitterRatio?: number;
-}
+export type { AutoReconnectConfig, ConnectionStatus };
 export interface ConnectConfig {
     mode?: 'tunnel' | 'direct';
     observer?: ClientObserverLike;
@@ -57,4 +35,3 @@ export declare function ProtocolProvider(props: {
     contract?: ProtocolContract;
 }): JSX.Element;
 export declare function useProtocol(): ProtocolContextValue;
-export {};

package/dist/index2.js

@@ -1,174 +1,75 @@
-import { createContext as E, onCleanup as P, createComponent as k, useContext as A } from "solid-js";
-import { createStore as W } from "solid-js/store";
-import { requestChannelGrant as j } from "./index4.js";
-import { redevenV1Contract as I } from "./index6.js";
-const f = E();
-function R(a) {
-  return a?.enabled ? {
-    enabled: !0,
-    maxAttempts: Math.max(1, a.maxAttempts ?? 5),
-    initialDelayMs: Math.max(0, a.initialDelayMs ?? 500),
-    maxDelayMs: Math.max(0, a.maxDelayMs ?? 1e4),
-    factor: Math.max(1, a.factor ?? 1.8),
-    jitterRatio: Math.max(0, a.jitterRatio ?? 0.2)
-  } : {
-    enabled: !1,
-    maxAttempts: 1,
-    initialDelayMs: 500,
-    maxDelayMs: 1e4,
-    factor: 1.8,
-    jitterRatio: 0.2
-  };
-}
-function S(a, c) {
-  const l = Math.min(c.maxDelayMs, c.initialDelayMs * Math.pow(c.factor, a)), h = c.jitterRatio <= 0 ? 0 : l * c.jitterRatio * (Math.random() * 2 - 1);
-  return Math.max(0, Math.round(l + h));
-}
-function _(a) {
-  const [c, l] = W({
-    status: "disconnected",
-    error: null,
-    client: null
-  }), h = a.contract ?? I;
-  let s = 0, i = null, u = null, m = null;
-  const p = () => {
-    u && (clearTimeout(u), u = null), m?.(), m = null;
-  }, v = (n) => new Promise((t) => {
-    m = t, u = setTimeout(() => {
-      u = null, m = null, t();
-    }, n);
-  }), w = () => {
-    p(), i = null, s += 1, c.client && c.client.close(), l({
-      status: "disconnected",
-      error: null,
-      client: null
-    });
-  }, y = (n, t, r) => {
-    if (n !== s || i !== t || c.status !== "connected") return;
-    if (!R(t.autoReconnect).enabled) {
-      l({
-        status: "error",
-        error: r,
-        client: null
-      });
-      return;
-    }
-    p(), s += 1;
-    const o = s;
-    l({
-      status: "connecting",
-      error: r,
-      client: null
-    }), x(o, t).catch(() => {
+import { createContext as h, onCleanup as v, createComponent as P, useContext as b } from "solid-js";
+import { createStore as C } from "solid-js/store";
+import { createReconnectManager as M } from "@floegence/flowersec-core/reconnect";
+import { requestChannelGrant as T } from "./index4.js";
+import { redevenV1Contract as x } from "./index6.js";
+const s = h();
+function B(r) {
+  const e = M(), [n, a] = C({
+    status: e.state().status,
+    error: e.state().error,
+    client: e.state().client
+  }), i = r.contract ?? x, u = e.subscribe((t) => {
+    a({
+      status: t.status,
+      error: t.error,
+      client: t.client
     });
-  }, C = (n, t) => {
-    const r = t.observer;
-    return {
-      onConnect: (...e) => r?.onConnect?.(...e),
-      onAttach: (...e) => r?.onAttach?.(...e),
-      onHandshake: (...e) => r?.onHandshake?.(...e),
-      onWsClose: (e, o) => {
-        r?.onWsClose?.(e, o), e === "peer_or_error" && y(n, t, new Error(`WebSocket closed (${o ?? "unknown"})`));
-      },
-      onWsError: (e) => {
-        r?.onWsError?.(e), y(n, t, new Error(`WebSocket error: ${e}`));
-      },
-      onRpcCall: (...e) => r?.onRpcCall?.(...e),
-      onRpcNotify: (...e) => r?.onRpcNotify?.(...e)
-    };
-  }, b = async (n, t) => {
-    const {
-      connectTunnelBrowser: r,
-      connectDirectBrowser: e
-    } = await import("@floegence/flowersec-core/browser"), o = {
-      observer: C(n, t),
-      keepaliveIntervalMs: t.keepaliveIntervalMs ?? 15e3,
-      connectTimeoutMs: t.connectTimeoutMs ?? 1e4,
-      handshakeTimeoutMs: t.handshakeTimeoutMs ?? 1e4
-    };
-    if ((t.mode ?? "tunnel") === "tunnel") {
-      const M = (t.getGrant ? await t.getGrant() : null) ?? t.grant ?? (t.controlplane ? await j(t.controlplane) : null);
-      if (!M)
-        throw new Error("Tunnel mode requires `getGrant`, `grant`, or `controlplane` config");
-      return r(M, o);
-    }
-    if (!t.directInfo)
-      throw new Error("Direct mode requires `directInfo`");
-    return e(t.directInfo, o);
-  }, x = async (n, t) => {
-    const r = R(t.autoReconnect);
-    let e = 0;
-    for (; ; ) {
-      if (n !== s || i !== t) return;
-      e += 1;
-      try {
-        const o = await b(n, t);
-        if (n !== s) {
-          o.close();
-          return;
-        }
-        if (i !== t) {
-          o.close();
-          return;
+  }), l = {
+    status: () => n.status,
+    error: () => n.error,
+    client: () => n.client,
+    contract: () => i,
+    connect: async (t) => {
+      await e.connect({
+        autoReconnect: t.autoReconnect,
+        observer: t.observer,
+        connectOnce: async ({
+          signal: m,
+          observer: d
+        }) => {
+          const {
+            connectTunnelBrowser: p,
+            connectDirectBrowser: w
+          } = await import("@floegence/flowersec-core/browser"), o = {
+            observer: d,
+            signal: m,
+            keepaliveIntervalMs: t.keepaliveIntervalMs ?? 15e3,
+            connectTimeoutMs: t.connectTimeoutMs ?? 1e4,
+            handshakeTimeoutMs: t.handshakeTimeoutMs ?? 1e4
+          };
+          if ((t.mode ?? "tunnel") === "tunnel") {
+            const c = (t.getGrant ? await t.getGrant() : null) ?? t.grant ?? (t.controlplane ? await T(t.controlplane) : null);
+            if (!c)
+              throw new Error("Tunnel mode requires `getGrant`, `grant`, or `controlplane` config");
+            return p(c, o);
+          }
+          if (!t.directInfo)
+            throw new Error("Direct mode requires `directInfo`");
+          return w(t.directInfo, o);
         }
-        l({
-          status: "connected",
-          client: o,
-          error: null
-        });
-        return;
-      } catch (o) {
-        const d = o instanceof Error ? o : new Error(String(o));
-        if (n !== s || i !== t) return;
-        if (!(r.enabled && e < r.maxAttempts))
-          throw l({
-            status: "error",
-            error: d,
-            client: null
-          }), d;
-        l({
-          status: "connecting",
-          error: d,
-          client: null
-        });
-        const T = S(e - 1, r);
-        await v(T);
-      }
-    }
-  }, D = {
-    status: () => c.status,
-    error: () => c.error,
-    client: () => c.client,
-    contract: () => h,
-    connect: async (n) => {
-      p(), s += 1;
-      const t = s;
-      i = n, c.client && c.client.close(), l({
-        status: "connecting",
-        error: null,
-        client: null
-      }), await x(t, n);
+      });
     },
     disconnect: () => {
-      w();
+      e.disconnect();
     }
   };
-  return P(() => {
-    w();
-  }), k(f.Provider, {
-    value: D,
+  return v(() => {
+    u(), e.disconnect();
+  }), P(s.Provider, {
+    value: l,
     get children() {
-      return a.children;
+      return r.children;
     }
   });
 }
-function $() {
-  const a = A(f);
-  if (!a)
+function D() {
+  const r = b(s);
+  if (!r)
     throw new Error("useProtocol must be used within a ProtocolProvider");
-  return a;
+  return r;
 }
 export {
-  _ as ProtocolProvider,
-  $ as useProtocol
+  B as ProtocolProvider,
+  D as useProtocol
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-protocol",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -24,7 +24,7 @@
     "solid-js": "^1.8.0"
   },
   "dependencies": {
-    "@floegence/flowersec-core": "^0.7.0"
+    "@floegence/flowersec-core": "^0.9.0"
   },
   "devDependencies": {
     "solid-js": "^1.9.11",