@floegence/floe-webapp-protocol 0.27.4 → 0.28.0

package/dist/index2.js

@@ -1,88 +1,101 @@
-import { onCleanup as C, createComponent as P, useContext as M, createContext as I } from "solid-js";
+import { onCleanup as P, createComponent as I, useContext as M, createContext as y } from "solid-js";
 import { createStore as T } from "solid-js/store";
 import { createReconnectManager as x } from "@floegence/flowersec-core/reconnect";
-import { requestChannelGrant as y } from "./index4.js";
-const u = I();
-function D(o) {
-  const n = x(), [c, d] = T({
+import { requestChannelGrant as k } from "./index4.js";
+const d = y();
+function S(o) {
+  const n = x(), [c, m] = T({
     status: n.state().status,
     error: n.state().error,
     client: n.state().client
-  }), m = o.contract, w = n.subscribe((t) => {
-    d({
+  }), f = o.contract, w = n.subscribe((t) => {
+    m({
       status: t.status,
       error: t.error,
       client: t.client
     });
   });
-  let s = null, r = null;
-  const h = async (t) => {
-    await n.connect({
+  let s = null, e = null;
+  const a = async (t, r) => {
+    const i = {
       autoReconnect: t.autoReconnect,
       observer: t.observer,
       connectOnce: async ({
-        signal: e,
-        observer: p
+        signal: p,
+        observer: v
       }) => {
         const {
-          connectTunnelBrowser: v,
-          connectDirectBrowser: b
-        } = await import("@floegence/flowersec-core/browser"), i = {
-          observer: p,
-          signal: e,
+          connectTunnelBrowser: b,
+          connectDirectBrowser: C
+        } = await import("@floegence/flowersec-core/browser"), l = {
+          observer: v,
+          signal: p,
           keepaliveIntervalMs: t.keepaliveIntervalMs ?? 15e3,
           connectTimeoutMs: t.connectTimeoutMs ?? 1e4,
           handshakeTimeoutMs: t.handshakeTimeoutMs ?? 1e4
         };
         if ((t.mode ?? "tunnel") === "tunnel") {
-          const l = (t.getGrant ? await t.getGrant() : null) ?? t.grant ?? (t.controlplane ? await y(t.controlplane) : null);
-          if (!l)
+          const u = (t.getGrant ? await t.getGrant() : null) ?? t.grant ?? (t.controlplane ? await k(t.controlplane) : null);
+          if (!u)
             throw new Error("Tunnel mode requires `getGrant`, `grant`, or `controlplane` config");
-          return v(l, i);
+          return b(u, l);
         }
         if (!t.directInfo)
           throw new Error("Direct mode requires `directInfo`");
-        return b(t.directInfo, i);
+        return C(t.directInfo, l);
       }
-    });
-  }, a = async (t) => {
-    const e = t ?? s;
-    if (!e)
-      throw new Error("reconnect() requires a config before the first connect() call");
-    return r || (s = e, r = h(e).finally(() => {
-      r = null;
-    }), r);
-  }, f = {
+    };
+    if (r === "hard") {
+      await n.connect(i);
+      return;
+    }
+    await n.connectIfNeeded(i);
+  }, h = {
     status: () => c.status,
     error: () => c.error,
     client: () => c.client,
-    contract: () => m,
+    contract: () => f,
     connect: async (t) => {
       s = t;
-      const e = n.state();
-      e.status === "connected" && e.client || e.status === "connecting" && !r || await a(t);
+      const r = n.state();
+      if (!(r.status === "connected" && r.client) && !(r.status === "connecting" && !e)) {
+        if (e) {
+          await e;
+          return;
+        }
+        e = a(t, "if_needed").finally(() => {
+          e = null;
+        }), await e;
+      }
+    },
+    reconnect: async (t) => {
+      const r = t ?? s;
+      if (!r)
+        throw new Error("reconnect() requires a config before the first connect() call");
+      return e || (s = r, e = a(r, "hard").finally(() => {
+        e = null;
+      }), e);
     },
-    reconnect: a,
     disconnect: () => {
       n.disconnect();
     }
   };
-  return C(() => {
+  return P(() => {
     w(), n.disconnect();
-  }), P(u.Provider, {
-    value: f,
+  }), I(d.Provider, {
+    value: h,
     get children() {
       return o.children;
     }
   });
 }
-function O() {
-  const o = M(u);
+function A() {
+  const o = M(d);
   if (!o)
     throw new Error("useProtocol must be used within a ProtocolProvider");
   return o;
 }
 export {
-  D as ProtocolProvider,
-  O as useProtocol
+  S as ProtocolProvider,
+  A as useProtocol
 };

package/package.json

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