@nivaro/react 0.3.28 → 0.3.30

package/dist/shared/lib/worker-socket.js

@@ -1,10 +1,10 @@
-import { bindClientChaosSocket as x } from "./client-chaos.js";
-import { onSignedIn as z, signedOutBackoff as F, isSignedOut as U } from "./signed-out.js";
-const j = 1, B = "nvr-realtime-worker";
-function N() {
+import { bindClientChaosSocket as $ } from "./client-chaos.js";
+import { onSignedIn as F, signedOutBackoff as q, isSignedOut as x } from "./signed-out.js";
+const z = 1, B = "nvr-realtime-worker";
+function j() {
   return typeof window < "u" && typeof window.SharedWorker == "function";
 }
-function Y() {
+function N() {
   try {
     const o = localStorage.getItem(B);
     return o === "on" || o === "off" ? o : null;
@@ -12,190 +12,197 @@ function Y() {
     return null;
   }
 }
-function $(o) {
-  if (!N() || Y() === "off") return !1;
+function Y(o, s) {
+  const u = typeof s == "string" ? s.trim() : "";
+  return u ? `${o}${o.includes("?") ? "&" : "?"}b=${encodeURIComponent(u.slice(0, 64))}` : o;
+}
+function G(o) {
+  if (!j() || N() === "off") return !1;
   try {
     return new URL(o, window.location.href).origin === window.location.origin;
   } catch {
     return !1;
   }
 }
-function J(o) {
-  const u = /* @__PURE__ */ new Map(), g = /* @__PURE__ */ new Set();
-  let c = "pending", s = null, n = null, d = !1, T = null, K = 0;
+function Q(o) {
+  const s = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Set();
+  let c = "pending", f = null, n = null, k = !1, T = null, K = 0;
   const E = /* @__PURE__ */ new Map(), M = [];
-  let R = 0, k = null, p = null, m = !1, w = !1, b = 0, h = 0, v = null;
-  const A = (e, t) => {
-    for (const r of [...u.get(e) ?? []])
+  let R = 0, w = null, p = null, m = !1, g = !1, b = 0, h = 0, v = null;
+  const A = (t, e) => {
+    for (const r of [...s.get(t) ?? []])
       try {
-        r(...t);
+        r(...e);
       } catch {
       }
-    for (const r of [...g])
+    for (const r of [...u])
       try {
-        r(e, ...t);
+        r(t, ...e);
       } catch {
       }
   }, C = () => {
-    if (k && clearTimeout(k), k = null, p && clearInterval(p), p = null, s)
+    if (w && clearTimeout(w), w = null, p && clearInterval(p), p = null, f)
       try {
-        s.postMessage({ t: "bye" }), s.close();
+        f.postMessage({ t: "bye" }), f.close();
       } catch {
       }
-    s = null;
-  }, l = (e) => {
+    f = null;
+  }, d = (t) => {
     var i, y, S;
     if (c === "fallback" || m) return;
-    const t = d;
-    C(), c = "fallback", d = !1;
+    const e = k;
+    C(), c = "fallback", k = !1;
     const r = o.fallback();
-    n = r, w && ((i = r.disconnect) == null || i.call(r));
-    for (const [O, W] of u) for (const q of W) r.on(O, q);
-    g.size && ((y = r.onAny) == null || y.call(r, (O, ...W) => I(O, W))), t && A("disconnect", ["worker-fallback"]), (S = o.onMode) == null || S.call(o, "fallback", e);
+    n = r, g && ((i = r.disconnect) == null || i.call(r));
+    for (const [O, W] of s) for (const U of W) r.on(O, U);
+    u.size && ((y = r.onAny) == null || y.call(r, (O, ...W) => I(O, W))), e && A("disconnect", ["worker-fallback"]), (S = o.onMode) == null || S.call(o, "fallback", t);
   };
-  function I(e, t) {
-    for (const r of [...g])
+  function I(t, e) {
+    for (const r of [...u])
       try {
-        r(e, ...t);
+        r(t, ...e);
       } catch {
       }
   }
-  const D = () => a({
+  const D = () => l({
     t: "hello",
     app: o.app,
     features: o.features ?? [],
     version: o.version ?? {},
     active: typeof document > "u" || document.visibilityState === "visible"
-  }), a = (e) => {
+  }), l = (t) => {
     try {
-      s == null || s.postMessage(e);
+      f == null || f.postMessage(t);
     } catch {
-      l("port-closed");
+      d("port-closed");
     }
-  }, L = (e) => {
+  }, L = (t) => {
     var r;
-    const t = e.data;
-    if (!(!t || typeof t != "object" || m))
-      switch (R = Date.now(), t.t) {
+    const e = t.data;
+    if (!(!e || typeof e != "object" || m))
+      switch (R = Date.now(), e.t) {
         case "ready": {
-          if (k && clearTimeout(k), k = null, t.proto !== j) return l(`proto-${String(t.proto)}`);
-          c = "worker", w || D(), p = setInterval(() => {
-            Date.now() - R > (o.silentMs ?? 2e4) && l("worker-silent");
+          if (w && clearTimeout(w), w = null, e.proto !== z) return d(`proto-${String(e.proto)}`);
+          c = "worker", g || D(), p = setInterval(() => {
+            Date.now() - R > (o.silentMs ?? 2e4) && d("worker-silent");
           }, 5e3), (r = o.onMode) == null || r.call(o, "worker", "ready");
           return;
         }
         case "ping":
-          a({ t: "pong" });
+          l({ t: "pong" });
           return;
         case "status": {
-          d = !!t.connected;
-          const i = typeof t.transport == "string" ? t.transport : null, y = i === "websocket" && T !== "websocket";
+          k = !!e.connected;
+          const i = typeof e.transport == "string" ? e.transport : null, y = i === "websocket" && T !== "websocket";
           if (T = i, y) for (const S of M.splice(0)) S();
           return;
         }
         case "need-token":
           P().then(
-            (i) => a({ t: "token", req: t.req, token: i, ...i ? {} : { signedOut: U() } })
+            (i) => l({ t: "token", req: e.req, token: i, ...i ? {} : { signedOut: x() } })
           );
           return;
         case "ev": {
-          if (w) return;
-          t.event === "connect" && (d = !0), t.event === "disconnect" && (d = !1), A(String(t.event), Array.isArray(t.args) ? t.args : []);
+          if (g) return;
+          e.event === "connect" && (k = !0), e.event === "disconnect" && (k = !1), A(String(e.event), Array.isArray(e.args) ? e.args : []);
           return;
         }
         case "ack": {
-          const i = E.get(t.id);
-          E.delete(t.id), i == null || i(...Array.isArray(t.args) ? t.args : []);
+          const i = E.get(e.id);
+          E.delete(e.id), i == null || i(...Array.isArray(e.args) ? e.args : []);
           return;
         }
         case "fallback":
-          l(String(t.reason ?? "worker"));
+          d(String(e.reason ?? "worker"));
           return;
         default:
           return;
       }
   }, P = async () => {
     if (Date.now() < h) return null;
-    const e = await o.authToken().catch(() => null);
-    return e ? (b = 0, h = 0, e) : (b += 1, h = Date.now() + F(b), null);
+    const t = await o.authToken().catch(() => null);
+    return t ? (b = 0, h = 0, t) : (b += 1, h = Date.now() + q(b), null);
   }, _ = () => {
-    if (!$(o.url)) return l("unsupported");
+    var t;
+    if (!G(o.url)) return d("unsupported");
     try {
-      const e = new SharedWorker(o.url, { name: o.name ?? o.app });
-      s = e.port, s.onmessage = L, s.onmessageerror = () => l("message-error"), e.onerror = () => l("worker-error"), s.start(), k = setTimeout(() => l("no-greeting"), o.readyTimeoutMs ?? 15e3);
+      const e = new SharedWorker(Y(o.url, (t = o.version) == null ? void 0 : t.build), {
+        name: o.name ?? o.app
+      });
+      f = e.port, f.onmessage = L, f.onmessageerror = () => d("message-error"), e.onerror = () => d("worker-error"), f.start(), w = setTimeout(() => d("no-greeting"), o.readyTimeoutMs ?? 15e3);
     } catch {
-      l("construct-failed");
+      d("construct-failed");
     }
     if (typeof window < "u") {
       const e = () => {
-        c === "worker" && document.visibilityState === "visible" && a({ t: "active" });
+        c === "worker" && document.visibilityState === "visible" && l({ t: "active" });
       };
       document.addEventListener("visibilitychange", e), window.addEventListener("focus", e), window.addEventListener("pagehide", () => {
-        c === "worker" && a({ t: "bye" });
+        c === "worker" && l({ t: "bye" });
       });
     }
-  }, f = {
+  }, a = {
     get connected() {
-      return w && c !== "fallback" ? !1 : c === "fallback" ? !!(n != null && n.connected) : d;
+      return g && c !== "fallback" ? !1 : c === "fallback" ? !!(n != null && n.connected) : k;
     },
-    on(e, t) {
-      const r = u.get(e) ?? /* @__PURE__ */ new Set();
-      return u.set(e, r), r.add(t), c === "fallback" && (n == null || n.on(e, t)), f;
+    on(t, e) {
+      const r = s.get(t) ?? /* @__PURE__ */ new Set();
+      return s.set(t, r), r.add(e), c === "fallback" && (n == null || n.on(t, e)), a;
     },
-    off(e, t) {
+    off(t, e) {
       var r;
-      return t ? (r = u.get(e)) == null || r.delete(t) : u.delete(e), c === "fallback" && (n == null || n.off(e, t)), f;
+      return e ? (r = s.get(t)) == null || r.delete(e) : s.delete(t), c === "fallback" && (n == null || n.off(t, e)), a;
     },
-    once(e, t) {
+    once(t, e) {
       const r = (...i) => {
-        f.off(e, r), t(...i);
+        a.off(t, r), e(...i);
       };
-      return f.on(e, r);
+      return a.on(t, r);
     },
-    onAny(e) {
+    onAny(t) {
       var r;
-      const t = g.size === 0;
-      return g.add(e), c === "fallback" && t && ((r = n == null ? void 0 : n.onAny) == null || r.call(n, (i, ...y) => I(i, y))), f;
+      const e = u.size === 0;
+      return u.add(t), c === "fallback" && e && ((r = n == null ? void 0 : n.onAny) == null || r.call(n, (i, ...y) => I(i, y))), a;
     },
-    offAny(e) {
-      return g.delete(e), f;
+    offAny(t) {
+      return u.delete(t), a;
     },
-    listeners(e) {
-      return [...u.get(e) ?? []];
+    listeners(t) {
+      return [...s.get(t) ?? []];
     },
-    emit(e, ...t) {
-      if (c === "fallback") return n == null ? void 0 : n.emit(e, ...t);
-      const r = t[t.length - 1];
-      if (w)
-        return typeof r == "function" && setTimeout(() => r(), 0), f;
+    emit(t, ...e) {
+      if (c === "fallback") return n == null ? void 0 : n.emit(t, ...e);
+      const r = e[e.length - 1];
+      if (g)
+        return typeof r == "function" && setTimeout(() => r(), 0), a;
       if (typeof r == "function") {
         const i = ++K;
-        E.set(i, r), a({ t: "emit", event: e, payload: t[0], ack: i });
-      } else a({ t: "emit", event: e, payload: t[0] });
-      return f;
+        E.set(i, r), l({ t: "emit", event: t, payload: e[0], ack: i });
+      } else l({ t: "emit", event: t, payload: e[0] });
+      return a;
     },
     connect() {
-      var e;
-      c === "fallback" ? (e = n == null ? void 0 : n.connect) == null || e.call(n) : a({ t: "connect" });
+      var t;
+      c === "fallback" ? (t = n == null ? void 0 : n.connect) == null || t.call(n) : l({ t: "connect" });
     },
     disconnect() {
-      var e;
-      m = !0, v == null || v(), C(), (e = n == null ? void 0 : n.disconnect) == null || e.call(n);
+      var t;
+      m = !0, v == null || v(), C(), (t = n == null ? void 0 : n.disconnect) == null || t.call(n);
     },
     signedIn() {
-      b = 0, h = 0, !(c !== "worker" || m) && (a({ t: "signed-in" }), (typeof document > "u" || document.visibilityState === "visible") && a({ t: "active" }));
+      b = 0, h = 0, !(c !== "worker" || m) && (l({ t: "signed-in" }), (typeof document > "u" || document.visibilityState === "visible") && l({ t: "active" }));
     },
     mode: () => c,
-    chaosPause(e) {
-      var t, r;
-      if (!(e === w || m)) {
-        if (w = e, c === "fallback") {
-          e ? (t = n == null ? void 0 : n.disconnect) == null || t.call(n) : (r = n == null ? void 0 : n.connect) == null || r.call(n);
+    chaosPause(t) {
+      var e, r;
+      if (!(t === g || m)) {
+        if (g = t, c === "fallback") {
+          t ? (e = n == null ? void 0 : n.disconnect) == null || e.call(n) : (r = n == null ? void 0 : n.connect) == null || r.call(n);
           return;
         }
-        if (e) {
-          const i = d;
-          d = !1, i && A("disconnect", ["transport close"]);
+        if (t) {
+          const i = k;
+          k = !1, i && A("disconnect", ["transport close"]);
           return;
         }
         c === "worker" && D(), typeof window < "u" && window.dispatchEvent(new CustomEvent("nvr:catchup-full"));
@@ -206,24 +213,25 @@ function J(o) {
         get transport() {
           return {
             get name() {
-              var e, t, r;
-              return c === "fallback" ? (r = (t = (e = n == null ? void 0 : n.io) == null ? void 0 : e.engine) == null ? void 0 : t.transport) == null ? void 0 : r.name : T ?? void 0;
+              var t, e, r;
+              return c === "fallback" ? (r = (e = (t = n == null ? void 0 : n.io) == null ? void 0 : t.engine) == null ? void 0 : e.transport) == null ? void 0 : r.name : T ?? void 0;
             }
           };
         },
-        once(e, t) {
-          e === "upgrade" && M.push(t);
+        once(t, e) {
+          t === "upgrade" && M.push(e);
         }
       }
     }
   };
-  return v = z(() => f.signedIn()), _(), x(f), f;
+  return v = F(() => a.signedIn()), _(), $(a), a;
 }
 export {
   B as WORKER_SOCKET_PREF_KEY,
-  j as WORKER_SOCKET_PROTO,
-  J as createWorkerSocket,
-  N as sharedWorkerSupported,
-  $ as shouldUseWorkerSocket,
-  Y as workerSocketPreference
+  z as WORKER_SOCKET_PROTO,
+  Q as createWorkerSocket,
+  j as sharedWorkerSupported,
+  G as shouldUseWorkerSocket,
+  N as workerSocketPreference,
+  Y as workerUrlForBuild
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nivaro/react",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "description": "React hooks and components for Nivaro CMS forms",
   "type": "module",
   "main": "./dist/index.js",