@floegence/floe-webapp-protocol 0.43.0 → 0.44.0

package/dist/client.d.ts

@@ -1,10 +1,11 @@
-import type { ArtifactSource, ConnectionSnapshot, ConnectionState, Session } from '@floegence/flowersec-core';
+import type { ArtifactSource, ConnectionDiagnostic, ConnectionSnapshot, ConnectionState, Session } from '@floegence/flowersec-core';
 import type { ConnectionControllerOptions } from '@floegence/flowersec-core/browser';
 import { type JSX } from 'solid-js';
 import type { ProtocolContract } from './contract';
 interface ProtocolContextValue {
     status: () => ConnectionState;
     snapshot: () => ConnectionSnapshot;
+    diagnostic: () => ConnectionDiagnostic;
     error: () => Error | null;
     session: () => Session | null;
     rpcTransport: () => Session['rpc'] | null;

package/dist/index2.js

@@ -1,33 +1,37 @@
-import { createContext as S, onCleanup as x, createComponent as E, useContext as z } from "solid-js";
-import { createStore as O } from "solid-js/store";
-const R = () => import("@floegence/flowersec-core/browser");
-class j extends Error {
+import { connectionDiagnostic as C, ConnectionControllerError as z } from "@floegence/flowersec-core";
+import { createContext as D, onCleanup as O, createComponent as g, useContext as N } from "solid-js";
+import { createStore as R } from "solid-js/store";
+const j = () => import("@floegence/flowersec-core/browser");
+class F extends Error {
   constructor() {
     super("Connection source or options changed; call replaceConnection() explicitly"), this.name = "ConnectionReplacementRequiredError";
   }
 }
-const m = S(), w = Object.freeze({
+const v = D(), y = Object.freeze({
   state: "idle",
   attempt: 0
-});
-function A(n) {
-  const [t, p] = O({
-    snapshot: w,
+}), b = C(y);
+function H(t) {
+  const [o, d] = R({
+    snapshot: y,
+    diagnostic: b,
     error: null
-  }), h = n.contract;
-  let r = null, u = null, a = null, l = null, s = 0;
-  const d = (e, o, c) => r === e && a === o && s === c, b = (e, o, c, i) => {
-    if (d(o, c, i))
+  }), S = t.contract;
+  let r = null, f = null, a = null, l = null, i = 0;
+  const p = (e, n, c) => r === e && a === n && i === c, E = (e, n, c, s) => {
+    if (p(n, c, s))
       try {
-        if (c.lifecycle?.synchronize(e), !d(o, c, i)) return;
-        p({
+        if (c.lifecycle?.synchronize(e), !p(n, c, s)) return;
+        const u = C(e);
+        d({
           snapshot: e,
-          error: N(e)
+          diagnostic: u,
+          error: _(e, u)
         });
-      } catch (f) {
-        const P = f instanceof Error ? f : new Error("Floe connection binding failed");
-        c.lifecycle?.dispose(), d(o, c, i) && p({
-          snapshot: Object.freeze({
+      } catch (u) {
+        const x = u instanceof Error ? u : new Error("Floe connection binding failed");
+        if (c.lifecycle?.dispose(), p(n, c, s)) {
+          const h = Object.freeze({
             state: "failed",
             attempt: e.attempt,
             failure: Object.freeze({
@@ -37,38 +41,49 @@ function A(n) {
             retryDisposition: Object.freeze({
               kind: "terminal"
             })
-          }),
-          error: P
-        }), o.close();
+          });
+          d({
+            snapshot: h,
+            diagnostic: C(h),
+            error: x
+          });
+        }
+        n.close();
       }
-  }, y = async () => {
-    const e = s;
-    u?.(), u = null;
-    const o = r, c = a;
-    r = null, a = null, c?.lifecycle?.dispose(), o !== null && await o.close(), e === s && r === null && a === null && p({
-      snapshot: w,
+  }, w = async () => {
+    const e = i;
+    f?.(), f = null;
+    const n = r, c = a;
+    r = null, a = null, c?.lifecycle?.dispose(), n !== null && await n.close(), e === i && r === null && a === null && d({
+      snapshot: y,
+      diagnostic: b,
       error: null
     });
-  }, C = async (e) => {
-    const o = s, {
+  }, m = async (e) => {
+    const n = i, {
       createConnectionController: c
-    } = await R();
-    if (o !== s) return;
-    const i = c(e.source, e.controller);
-    a = e, r = i, u = i.subscribe((f) => b(f, i, e, o)), i.start(), await i.waitForSession();
-  }, v = {
-    status: () => t.snapshot.state,
-    snapshot: () => t.snapshot,
-    error: () => t.error,
-    session: () => t.snapshot.currentSession ?? null,
-    rpcTransport: () => t.snapshot.currentSession?.rpc ?? null,
-    contract: () => h,
+    } = await j();
+    if (n !== i) return;
+    const s = await c(e.source, e.controller);
+    if (n !== i) {
+      await s.close();
+      return;
+    }
+    a = e, r = s, f = s.subscribe((u) => E(u, s, e, n)), s.start(), await s.waitForSession();
+  }, P = {
+    status: () => o.snapshot.state,
+    snapshot: () => o.snapshot,
+    diagnostic: () => o.diagnostic,
+    error: () => o.error,
+    session: () => o.snapshot.currentSession ?? null,
+    rpcTransport: () => o.snapshot.currentSession?.rpc ?? null,
+    contract: () => S,
     connect: async (e) => {
-      if (r !== null && a !== null && !F(a, e))
-        throw new j();
+      if (r !== null && a !== null && !I(a, e))
+        throw new F();
       return l !== null || (l = (async () => {
         if (r === null) {
-          await C(e);
+          await m(e);
           return;
         }
         r.start(), await r.waitForSession();
@@ -78,38 +93,38 @@ function A(n) {
     },
     replaceConnection: async (e) => (l !== null && await l.catch(() => {
     }), l = (async () => {
-      s += 1, await y(), s += 1, await C(e);
+      i += 1, await w(), i += 1, await m(e);
     })().finally(() => {
       l = null;
     }), l),
     retryNow: () => r?.retryNow() ?? !1,
     disconnect: () => {
-      s += 1, y();
+      i += 1, w();
     }
   };
-  return x(() => {
-    s += 1, u?.(), a?.lifecycle?.dispose(), r?.close();
-  }), E(m.Provider, {
-    value: v,
+  return O(() => {
+    i += 1, f?.(), a?.lifecycle?.dispose(), r?.close();
+  }), g(v.Provider, {
+    value: P,
     get children() {
-      return n.children;
+      return t.children;
     }
   });
 }
-function B() {
-  const n = z(m);
-  if (!n) throw new Error("useProtocol must be used within a ProtocolProvider");
-  return n;
+function J() {
+  const t = N(v);
+  if (!t) throw new Error("useProtocol must be used within a ProtocolProvider");
+  return t;
 }
-function F(n, t) {
-  return n.source === t.source && n.controller === t.controller && n.lifecycle === t.lifecycle;
+function I(t, o) {
+  return t.source === o.source && t.controller === o.controller && t.lifecycle === o.lifecycle;
 }
-function N(n) {
-  const t = n.failure;
-  return t === void 0 ? null : new Error(`${t.phase}:${t.code}`);
+function _(t, o) {
+  const d = t.failure;
+  return d === void 0 || t.state !== "failed" && t.state !== "closed" ? null : new z(t.state === "closed" ? "closed" : "failed", d, t.retryDisposition, o);
 }
 export {
-  j as ConnectionReplacementRequiredError,
-  A as ProtocolProvider,
-  B as useProtocol
+  F as ConnectionReplacementRequiredError,
+  H as ProtocolProvider,
+  J as useProtocol
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-protocol",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -34,7 +34,7 @@
     "solid-js": "^1.8.0"
   },
   "dependencies": {
-    "@floegence/flowersec-core": "2.5.2"
+    "@floegence/flowersec-core": "3.1.1"
   },
   "devDependencies": {
     "solid-js": "^1.9.11",