@xyo-network/xl1-react-client-sdk 5.5.4 → 5.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -75,31 +75,57 @@ var hasXyoClient = () => {
75
75
  return "client" in globalThis.xyo;
76
76
  };
77
77
  var listenForClientInjection = (onClientReady, timeout, onTimeout) => {
78
- let resolved = false;
78
+ let active = true;
79
+ const dispose = () => {
80
+ if (!active) return;
81
+ active = false;
82
+ removeEventListener("xyo:plugin-ready", listener);
83
+ clearTimeout(timer);
84
+ };
79
85
  const listener = () => {
86
+ if (!active) return;
87
+ dispose();
80
88
  onClientReady();
81
- resolved = true;
82
89
  };
83
90
  addEventListener("xyo:plugin-ready", listener);
84
- setTimeout(() => {
85
- if (resolved) {
86
- return;
87
- }
88
- removeEventListener("xyo:plugin-ready", listener);
91
+ const timer = setTimeout(() => {
92
+ if (!active) return;
93
+ dispose();
89
94
  onTimeout();
90
95
  }, timeout);
96
+ return dispose;
91
97
  };
92
- async function getXyoClient(timeout = CLIENT_LISTENER_TIMEOUT) {
93
- if (isUndefined(globalThis.xyo)) {
94
- return null;
95
- }
96
- return hasXyoClient() ? globalThis.xyo.client : await new Promise((resolve) => {
97
- listenForClientInjection(
98
+ var WalletDiscoveryAbortError = class extends Error {
99
+ name = "AbortError";
100
+ };
101
+ function discoveryAbortError(reason) {
102
+ if (reason instanceof Error) return reason;
103
+ return new WalletDiscoveryAbortError("Wallet discovery aborted", { cause: reason });
104
+ }
105
+ async function getXyoClient(timeout = CLIENT_LISTENER_TIMEOUT, signal) {
106
+ if (signal?.aborted === true) throw discoveryAbortError(signal.reason);
107
+ if (isUndefined(globalThis.xyo)) return null;
108
+ if (hasXyoClient()) return globalThis.xyo.client;
109
+ return await new Promise((resolve, reject) => {
110
+ let dispose = () => {
111
+ };
112
+ const cleanup = () => {
113
+ dispose();
114
+ signal?.removeEventListener("abort", onAbort);
115
+ };
116
+ const onAbort = () => {
117
+ cleanup();
118
+ reject(discoveryAbortError(signal?.reason));
119
+ };
120
+ signal?.addEventListener("abort", onAbort, { once: true });
121
+ dispose = listenForClientInjection(
98
122
  () => {
99
- resolve(globalThis.xyo.client);
123
+ cleanup();
124
+ resolve(globalThis.xyo?.client ?? null);
100
125
  },
101
126
  timeout,
102
127
  () => {
128
+ cleanup();
103
129
  resolve(null);
104
130
  }
105
131
  );
@@ -117,6 +143,7 @@ var useClientFromWallet = (timeout) => {
117
143
  const [state, setState] = useState(initialState);
118
144
  useEffect(() => {
119
145
  let cancelled = false;
146
+ const controller = new AbortController();
120
147
  const initialize = async () => {
121
148
  setState((prev) => {
122
149
  if (prev.isLoading) return prev;
@@ -128,7 +155,7 @@ var useClientFromWallet = (timeout) => {
128
155
  });
129
156
  try {
130
157
  if (cancelled) return;
131
- const client = await getXyoClient(timeout);
158
+ const client = await getXyoClient(timeout, controller.signal);
132
159
  if (!cancelled) {
133
160
  if (client === null) {
134
161
  setState({
@@ -167,7 +194,6 @@ var useClientFromWallet = (timeout) => {
167
194
  error: null
168
195
  });
169
196
  };
170
- const controller = new AbortController();
171
197
  addEventListener("xyo:plugin-ready", onPluginReady, { signal: controller.signal });
172
198
  return () => {
173
199
  cancelled = true;
@@ -2259,6 +2285,7 @@ var InPageGatewaysProvider = ({
2259
2285
  const [gateways, setGateways] = useState15({});
2260
2286
  const [errors, setErrors] = useState15({});
2261
2287
  const [previousSignerTransport, setPreviousSignerTransport] = useState15(signerTransport);
2288
+ const [pageGeneration, setPageGeneration] = useState15(0);
2262
2289
  const clearAll = useCallback6(() => {
2263
2290
  setGateways({});
2264
2291
  setErrors({});
@@ -2267,6 +2294,15 @@ var InPageGatewaysProvider = ({
2267
2294
  clearAll();
2268
2295
  setPreviousSignerTransport(signerTransport);
2269
2296
  }
2297
+ useEffect5(() => {
2298
+ const controller = new AbortController();
2299
+ addEventListener("pageshow", (event) => {
2300
+ if (!event.persisted) return;
2301
+ clearAll();
2302
+ setPageGeneration((generation) => generation + 1);
2303
+ }, { signal: controller.signal });
2304
+ return () => controller.abort();
2305
+ }, [clearAll]);
2270
2306
  useEffect5(() => {
2271
2307
  let cancelled = false;
2272
2308
  const ownedSystems = [];
@@ -2325,7 +2361,7 @@ var InPageGatewaysProvider = ({
2325
2361
  for (const owned of ownedSystems) owned.disposePageLifecycle();
2326
2362
  void Promise.allSettled(ownedSystems.map(async (owned) => await owned.system.stop()));
2327
2363
  };
2328
- }, [localEndpoint, signerAccount, signerFactory, signerProviderId, signerTransport, transport]);
2364
+ }, [localEndpoint, pageGeneration, signerAccount, signerFactory, signerProviderId, signerTransport, transport]);
2329
2365
  const value = useMemo6(() => {
2330
2366
  const value2 = {
2331
2367
  clearAll,