@xyo-network/xl1-react-client-sdk 5.7.1 → 5.8.2
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.
- package/README.md +4 -1
- package/dist/browser/client/components/connected/DataLakeAddToChainPanel.d.ts.map +1 -1
- package/dist/browser/client/components/connected/DataLakeInsertPanel.d.ts.map +1 -1
- package/dist/browser/client/components/connected/DataLakeRequestAccessPanel.d.ts.map +1 -1
- package/dist/browser/client/context/in-page/InPageGatewaysState.d.ts +6 -0
- package/dist/browser/client/context/in-page/InPageGatewaysState.d.ts.map +1 -1
- package/dist/browser/client/context/in-page/Provider.d.ts +9 -1
- package/dist/browser/client/context/in-page/Provider.d.ts.map +1 -1
- package/dist/browser/client/context/in-page/useInPageGatewayRetry.d.ts +17 -0
- package/dist/browser/client/context/in-page/useInPageGatewayRetry.d.ts.map +1 -0
- package/dist/browser/client/context/providers/GatewayProvider.d.ts +3 -1
- package/dist/browser/client/context/providers/GatewayProvider.d.ts.map +1 -1
- package/dist/browser/client/hooks/client/permissions/useGrantedAccounts.d.ts.map +1 -1
- package/dist/browser/client/hooks/client/permissions/usePermissionsAccounts.d.ts.map +1 -1
- package/dist/browser/client/hooks/helpers/getXyoClient.d.ts.map +1 -1
- package/dist/browser/client/index.mjs +121 -70
- package/dist/browser/client/index.mjs.map +4 -4
- package/dist/browser/index.mjs +122 -74
- package/dist/browser/index.mjs.map +4 -4
- package/dist/browser/shared/components/stack/LabelValueStack.d.ts.map +1 -1
- package/dist/browser/shared/index.mjs +1 -4
- package/dist/browser/shared/index.mjs.map +2 -2
- package/package.json +17 -17
package/dist/browser/index.mjs
CHANGED
|
@@ -99,8 +99,7 @@ function grantedAccountsFromCaveat(value) {
|
|
|
99
99
|
return [...new Set(accounts)];
|
|
100
100
|
}
|
|
101
101
|
function isSameAccounts(first, second) {
|
|
102
|
-
|
|
103
|
-
return isDefined2(first) && isDefined2(second) && first.length === second.length && first.every((account, index) => account === second[index]);
|
|
102
|
+
return first === second || isDefined2(first) && isDefined2(second) && first.length === second.length && first.every((account, index) => account === second[index]);
|
|
104
103
|
}
|
|
105
104
|
function settleRead(previous, next) {
|
|
106
105
|
if (previous?.permissions !== next.permissions) return next;
|
|
@@ -186,8 +185,7 @@ var WalletDiscoveryAbortError = class extends Error {
|
|
|
186
185
|
name = "AbortError";
|
|
187
186
|
};
|
|
188
187
|
function discoveryAbortError(reason) {
|
|
189
|
-
|
|
190
|
-
return new WalletDiscoveryAbortError("Wallet discovery aborted", { cause: reason });
|
|
188
|
+
return reason instanceof Error ? reason : new WalletDiscoveryAbortError("Wallet discovery aborted", { cause: reason });
|
|
191
189
|
}
|
|
192
190
|
async function getXyoClient(timeout = CLIENT_LISTENER_TIMEOUT, signal) {
|
|
193
191
|
if (signal?.aborted === true) throw discoveryAbortError(signal.reason);
|
|
@@ -333,15 +331,14 @@ var useAccountPermissions = () => {
|
|
|
333
331
|
const { permissions, error } = usePermissions();
|
|
334
332
|
return usePromise(async () => {
|
|
335
333
|
if (isDefinedNotNull(error)) throw error;
|
|
336
|
-
if (isDefined3(permissions))
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
}
|
|
334
|
+
if (!isDefined3(permissions)) return;
|
|
335
|
+
const restrictedAccounts = await findCaveat(
|
|
336
|
+
permissions,
|
|
337
|
+
// TODO - extract to constant in protocol package
|
|
338
|
+
"xyoWallet_getAccounts",
|
|
339
|
+
"restrictReturnedAccounts"
|
|
340
|
+
);
|
|
341
|
+
return validateRestrictedAccounts(restrictedAccounts);
|
|
345
342
|
}, [permissions]);
|
|
346
343
|
};
|
|
347
344
|
|
|
@@ -1227,11 +1224,9 @@ function parsePayload(raw) {
|
|
|
1227
1224
|
try {
|
|
1228
1225
|
const parsed = JSON.parse(trimmed);
|
|
1229
1226
|
if (Array.isArray(parsed)) {
|
|
1230
|
-
|
|
1231
|
-
return { ok: false, error: "Provide a single payload object (this flow chains one payload onto the chain at a time)." };
|
|
1227
|
+
return parsed.length === 1 ? { ok: true, payload: parsed[0] } : { ok: false, error: "Provide a single payload object (this flow chains one payload onto the chain at a time)." };
|
|
1232
1228
|
}
|
|
1233
|
-
|
|
1234
|
-
return { ok: false, error: "Payload must be a JSON object." };
|
|
1229
|
+
return parsed !== null && typeof parsed === "object" ? { ok: true, payload: parsed } : { ok: false, error: "Payload must be a JSON object." };
|
|
1235
1230
|
} catch (e) {
|
|
1236
1231
|
return { ok: false, error: `Invalid JSON: ${e.message}` };
|
|
1237
1232
|
}
|
|
@@ -1382,7 +1377,7 @@ var AddToChainSection = ({
|
|
|
1382
1377
|
var DataLakeAddToChainPanel = ({
|
|
1383
1378
|
explorerUrl = DEFAULT_EXPLORER_URL2,
|
|
1384
1379
|
gatewayName = SequenceNetwork.id,
|
|
1385
|
-
initialPayloadJson,
|
|
1380
|
+
initialPayloadJson = "",
|
|
1386
1381
|
payloadSchema = DEFAULT_PAYLOAD_SCHEMA,
|
|
1387
1382
|
timeout,
|
|
1388
1383
|
...props
|
|
@@ -1393,7 +1388,7 @@ var DataLakeAddToChainPanel = ({
|
|
|
1393
1388
|
error: gatewayError,
|
|
1394
1389
|
timedout
|
|
1395
1390
|
} = useGatewayFromWallet(gatewayName, timeout);
|
|
1396
|
-
const [payloadText, setPayloadText] = useState7(initialPayloadJson
|
|
1391
|
+
const [payloadText, setPayloadText] = useState7(initialPayloadJson);
|
|
1397
1392
|
usePromise2(async () => setPayloadText(await buildDefaultPayload(payloadSchema)), [payloadSchema]);
|
|
1398
1393
|
const parse = useMemo2(() => parsePayload(payloadText), [payloadText]);
|
|
1399
1394
|
const [selectedLakeId, setSelectedLakeId] = useState7("");
|
|
@@ -1776,8 +1771,7 @@ function parsePayload2(raw) {
|
|
|
1776
1771
|
try {
|
|
1777
1772
|
const parsed = JSON.parse(trimmed);
|
|
1778
1773
|
if (Array.isArray(parsed)) return { ok: true, payloads: parsed };
|
|
1779
|
-
|
|
1780
|
-
return { ok: false, error: "Payload must be a JSON object or array of objects." };
|
|
1774
|
+
return parsed !== null && typeof parsed === "object" ? { ok: true, payloads: [parsed] } : { ok: false, error: "Payload must be a JSON object or array of objects." };
|
|
1781
1775
|
} catch (e) {
|
|
1782
1776
|
return { ok: false, error: `Invalid JSON: ${e.message}` };
|
|
1783
1777
|
}
|
|
@@ -2028,10 +2022,7 @@ var DataLakeRequestAccessPanel = ({ timeout, ...props }) => {
|
|
|
2028
2022
|
const supportsSchemasFilter = capability !== "viewer";
|
|
2029
2023
|
const options = useMemo5(() => {
|
|
2030
2024
|
const cap = capability === "read+write" ? { read: true, write: true } : capability;
|
|
2031
|
-
|
|
2032
|
-
return { capability: cap, schemas: [observationSchema, locationSchema] };
|
|
2033
|
-
}
|
|
2034
|
-
return { capability: cap };
|
|
2025
|
+
return supportsSchemasFilter && includeSchemas ? { capability: cap, schemas: [observationSchema, locationSchema] } : { capability: cap };
|
|
2035
2026
|
}, [capability, includeSchemas, supportsSchemasFilter]);
|
|
2036
2027
|
return /* @__PURE__ */ jsxs14(
|
|
2037
2028
|
Stack14,
|
|
@@ -2374,6 +2365,7 @@ import {
|
|
|
2374
2365
|
useCallback as useCallback7,
|
|
2375
2366
|
useEffect as useEffect6,
|
|
2376
2367
|
useMemo as useMemo6,
|
|
2368
|
+
useRef as useRef2,
|
|
2377
2369
|
useState as useState16
|
|
2378
2370
|
} from "react";
|
|
2379
2371
|
import { jsx as jsx17 } from "react/jsx-runtime";
|
|
@@ -2408,76 +2400,111 @@ var InPageGatewaysProvider = ({
|
|
|
2408
2400
|
}, { signal: controller.signal });
|
|
2409
2401
|
return () => controller.abort();
|
|
2410
2402
|
}, [clearAll]);
|
|
2403
|
+
const retryInSessionRef = useRef2(void 0);
|
|
2411
2404
|
useEffect6(() => {
|
|
2412
2405
|
let cancelled = false;
|
|
2413
2406
|
const ownedSystems = [];
|
|
2407
|
+
const running = /* @__PURE__ */ new Set();
|
|
2408
|
+
const launching = /* @__PURE__ */ new Set();
|
|
2409
|
+
const launchNetwork = async (networkId) => {
|
|
2410
|
+
const system = await launchInPageGatewaySystem(
|
|
2411
|
+
networkId,
|
|
2412
|
+
localEndpoint,
|
|
2413
|
+
signerTransport,
|
|
2414
|
+
signerFactory,
|
|
2415
|
+
transport,
|
|
2416
|
+
signerAccount,
|
|
2417
|
+
signerProviderId
|
|
2418
|
+
);
|
|
2419
|
+
if (cancelled) {
|
|
2420
|
+
await Promise.allSettled([system.stop()]);
|
|
2421
|
+
return system.gateway;
|
|
2422
|
+
}
|
|
2423
|
+
const disposePageLifecycle = bindPageLifecycle(system, {
|
|
2424
|
+
onStopError: (error) => {
|
|
2425
|
+
if (cancelled) return;
|
|
2426
|
+
startTransition(() => {
|
|
2427
|
+
setErrors((previous) => ({
|
|
2428
|
+
...previous,
|
|
2429
|
+
[networkId]: toError2(error)
|
|
2430
|
+
}));
|
|
2431
|
+
});
|
|
2432
|
+
}
|
|
2433
|
+
});
|
|
2434
|
+
ownedSystems.push({ disposePageLifecycle, system });
|
|
2435
|
+
running.add(networkId);
|
|
2436
|
+
return system.gateway;
|
|
2437
|
+
};
|
|
2414
2438
|
const buildAll = async () => {
|
|
2415
2439
|
if (cancelled) return;
|
|
2416
|
-
const
|
|
2417
|
-
|
|
2418
|
-
|
|
2419
|
-
|
|
2420
|
-
|
|
2421
|
-
|
|
2422
|
-
|
|
2423
|
-
|
|
2424
|
-
|
|
2425
|
-
|
|
2426
|
-
|
|
2427
|
-
|
|
2428
|
-
|
|
2429
|
-
return { id: network.id, gateway: system.gateway };
|
|
2430
|
-
}
|
|
2431
|
-
const disposePageLifecycle = bindPageLifecycle(system, {
|
|
2432
|
-
onStopError: (error) => {
|
|
2433
|
-
if (cancelled) return;
|
|
2434
|
-
startTransition(() => {
|
|
2435
|
-
setErrors((previous) => ({
|
|
2436
|
-
...previous,
|
|
2437
|
-
[network.id]: error instanceof Error ? error : new Error(String(error))
|
|
2438
|
-
}));
|
|
2439
|
-
});
|
|
2440
|
-
}
|
|
2441
|
-
});
|
|
2442
|
-
ownedSystems.push({ disposePageLifecycle, system });
|
|
2443
|
-
return { id: network.id, gateway: system.gateway };
|
|
2444
|
-
})
|
|
2445
|
-
);
|
|
2446
|
-
if (!cancelled) {
|
|
2447
|
-
const nextGateways = {};
|
|
2448
|
-
const nextErrors = {};
|
|
2449
|
-
for (const [index, result] of results.entries()) {
|
|
2450
|
-
const networkId = DefaultNetworks3[index].id;
|
|
2451
|
-
if (result.status === "fulfilled") {
|
|
2452
|
-
nextGateways[networkId] = result.value.gateway;
|
|
2453
|
-
} else {
|
|
2454
|
-
nextErrors[networkId] = result.reason instanceof Error ? result.reason : new Error(String(result.reason));
|
|
2455
|
-
}
|
|
2440
|
+
const networkIds = DefaultNetworks3.map((network) => network.id);
|
|
2441
|
+
for (const networkId of networkIds) launching.add(networkId);
|
|
2442
|
+
const results = await Promise.allSettled(networkIds.map(async (networkId) => await launchNetwork(networkId)));
|
|
2443
|
+
for (const networkId of networkIds) launching.delete(networkId);
|
|
2444
|
+
if (cancelled) return;
|
|
2445
|
+
const nextGateways = {};
|
|
2446
|
+
const nextErrors = {};
|
|
2447
|
+
for (const [index, result] of results.entries()) {
|
|
2448
|
+
const networkId = networkIds[index];
|
|
2449
|
+
if (result.status === "fulfilled") {
|
|
2450
|
+
nextGateways[networkId] = result.value;
|
|
2451
|
+
} else {
|
|
2452
|
+
nextErrors[networkId] = toError2(result.reason);
|
|
2456
2453
|
}
|
|
2454
|
+
}
|
|
2455
|
+
startTransition(() => {
|
|
2456
|
+
setGateways(nextGateways);
|
|
2457
|
+
setErrors(nextErrors);
|
|
2458
|
+
});
|
|
2459
|
+
};
|
|
2460
|
+
const retryNetwork = async (networkId) => {
|
|
2461
|
+
launching.add(networkId);
|
|
2462
|
+
try {
|
|
2463
|
+
const gateway = await launchNetwork(networkId);
|
|
2464
|
+
if (cancelled) return;
|
|
2465
|
+
startTransition(() => {
|
|
2466
|
+
setGateways((previous) => ({ ...previous, [networkId]: gateway }));
|
|
2467
|
+
setErrors(({ [networkId]: _cleared, ...previous }) => previous);
|
|
2468
|
+
});
|
|
2469
|
+
} catch (error) {
|
|
2470
|
+
if (cancelled) return;
|
|
2457
2471
|
startTransition(() => {
|
|
2458
|
-
|
|
2459
|
-
setErrors(nextErrors);
|
|
2472
|
+
setErrors((previous) => ({ ...previous, [networkId]: toError2(error) }));
|
|
2460
2473
|
});
|
|
2474
|
+
} finally {
|
|
2475
|
+
launching.delete(networkId);
|
|
2461
2476
|
}
|
|
2462
2477
|
};
|
|
2478
|
+
retryInSessionRef.current = (networkId) => {
|
|
2479
|
+
if (cancelled || running.has(networkId) || launching.has(networkId)) return;
|
|
2480
|
+
void retryNetwork(networkId);
|
|
2481
|
+
};
|
|
2463
2482
|
void buildAll();
|
|
2464
2483
|
return () => {
|
|
2465
2484
|
cancelled = true;
|
|
2485
|
+
retryInSessionRef.current = void 0;
|
|
2466
2486
|
for (const owned of ownedSystems) owned.disposePageLifecycle();
|
|
2467
2487
|
void Promise.allSettled(ownedSystems.map(async (owned) => await owned.system.stop()));
|
|
2468
2488
|
};
|
|
2469
2489
|
}, [localEndpoint, pageGeneration, signerAccount, signerFactory, signerProviderId, signerTransport, transport]);
|
|
2490
|
+
const retry = useCallback7((gatewayName) => {
|
|
2491
|
+
retryInSessionRef.current?.(gatewayName);
|
|
2492
|
+
}, []);
|
|
2470
2493
|
const value = useMemo6(() => {
|
|
2471
2494
|
const value2 = {
|
|
2472
2495
|
clearAll,
|
|
2473
2496
|
errors,
|
|
2474
2497
|
gateways,
|
|
2475
|
-
provided: true
|
|
2498
|
+
provided: true,
|
|
2499
|
+
retry
|
|
2476
2500
|
};
|
|
2477
2501
|
return value2;
|
|
2478
|
-
}, [clearAll, errors, gateways]);
|
|
2502
|
+
}, [clearAll, errors, gateways, retry]);
|
|
2479
2503
|
return /* @__PURE__ */ jsx17(InPageGatewaysContext, { value, children });
|
|
2480
2504
|
};
|
|
2505
|
+
function toError2(error) {
|
|
2506
|
+
return error instanceof Error ? error : new Error(String(error));
|
|
2507
|
+
}
|
|
2481
2508
|
|
|
2482
2509
|
// src/client/context/in-page/useProvidedInPageGateways.ts
|
|
2483
2510
|
import { useContextEx } from "@ariestools/sdk-react";
|
|
@@ -2486,6 +2513,28 @@ var useProvidedInPageGateways = (required = true) => useContextEx(InPageGateways
|
|
|
2486
2513
|
// src/client/context/providers/GatewayProvider.tsx
|
|
2487
2514
|
import { isDefinedNotNull as isDefinedNotNull12, isNull as isNull3 } from "@ariestools/sdk";
|
|
2488
2515
|
import { useMemo as useMemo7 } from "react";
|
|
2516
|
+
|
|
2517
|
+
// src/client/context/in-page/useInPageGatewayRetry.ts
|
|
2518
|
+
import { useEffect as useEffect7, useRef as useRef3 } from "react";
|
|
2519
|
+
var IN_PAGE_GATEWAY_RETRY_BASE_MS = 1e3;
|
|
2520
|
+
var IN_PAGE_GATEWAY_RETRY_MAX_MS = 3e4;
|
|
2521
|
+
function useInPageGatewayRetry(gatewayName, error, retry) {
|
|
2522
|
+
const failuresRef = useRef3({ count: 0, gatewayName });
|
|
2523
|
+
useEffect7(() => {
|
|
2524
|
+
if (failuresRef.current.gatewayName !== gatewayName || error === void 0) {
|
|
2525
|
+
failuresRef.current = { count: 0, gatewayName };
|
|
2526
|
+
}
|
|
2527
|
+
if (gatewayName === void 0 || error === void 0 || retry === void 0) return;
|
|
2528
|
+
const delay = Math.min(IN_PAGE_GATEWAY_RETRY_MAX_MS, IN_PAGE_GATEWAY_RETRY_BASE_MS * 2 ** failuresRef.current.count);
|
|
2529
|
+
const timer = setTimeout(() => {
|
|
2530
|
+
failuresRef.current.count += 1;
|
|
2531
|
+
retry(gatewayName);
|
|
2532
|
+
}, delay);
|
|
2533
|
+
return () => clearTimeout(timer);
|
|
2534
|
+
}, [error, gatewayName, retry]);
|
|
2535
|
+
}
|
|
2536
|
+
|
|
2537
|
+
// src/client/context/providers/GatewayProvider.tsx
|
|
2489
2538
|
import { jsx as jsx18, jsxs as jsxs17 } from "react/jsx-runtime";
|
|
2490
2539
|
var GatewayProvider = ({ gatewayName, children }) => {
|
|
2491
2540
|
const {
|
|
@@ -2495,10 +2544,12 @@ var GatewayProvider = ({ gatewayName, children }) => {
|
|
|
2495
2544
|
const {
|
|
2496
2545
|
gateways: allGateways,
|
|
2497
2546
|
errors: allGatewayErrors,
|
|
2498
|
-
clearAll
|
|
2547
|
+
clearAll,
|
|
2548
|
+
retry
|
|
2499
2549
|
} = useProvidedInPageGateways(true);
|
|
2500
2550
|
const gatewayFromConfig = gatewayName ? allGateways[gatewayName] : void 0;
|
|
2501
2551
|
const gatewayFromConfigError = gatewayName ? allGatewayErrors[gatewayName] : void 0;
|
|
2552
|
+
useInPageGatewayRetry(gatewayName, gatewayFromConfigError, retry);
|
|
2502
2553
|
const { defaultGateway, gateways } = useMemo7(() => {
|
|
2503
2554
|
if (isNull3(gatewayFromWallet)) {
|
|
2504
2555
|
return {
|
|
@@ -2719,10 +2770,7 @@ var LabelValueStack = ({
|
|
|
2719
2770
|
}) => {
|
|
2720
2771
|
const theme = useTheme3();
|
|
2721
2772
|
const formattedValue = (value) => {
|
|
2722
|
-
|
|
2723
|
-
return ellipsize(value, 8);
|
|
2724
|
-
}
|
|
2725
|
-
return value;
|
|
2773
|
+
return isXyoAddress(value) ? ellipsize(value, 8) : value;
|
|
2726
2774
|
};
|
|
2727
2775
|
return /* @__PURE__ */ jsxs20(
|
|
2728
2776
|
Stack18,
|