@floegence/floe-webapp-protocol 0.43.0 → 0.44.1

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-protocol",
-  "version": "0.43.0",
+  "version": "0.44.1",
   "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",