@calimero-network/mero-react 9.7.1 → 9.8.1
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/dist/index.cjs +95 -10
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +46 -7
- package/dist/index.d.ts +46 -7
- package/dist/index.js +94 -12
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/index.cjs
CHANGED
|
@@ -454,7 +454,51 @@ async function foundDelegatedNamespace(s, req = {}, deps = {}) {
|
|
|
454
454
|
`founded ${founded.namespaceId} but could not give it its application: ${founded.applicationError ?? "unknown reason"}`
|
|
455
455
|
);
|
|
456
456
|
}
|
|
457
|
-
|
|
457
|
+
const ha = founded.teeEnabled ? await enableHaBestEffort(s, founded.namespaceId, founded.salt, relay, deps) : {
|
|
458
|
+
haEnabled: false,
|
|
459
|
+
haError: `the relay did not attest the founding, so no fleet node could be admitted for HA${founded.teeError ? `: ${founded.teeError}` : ""}`
|
|
460
|
+
};
|
|
461
|
+
return { namespaceId: founded.namespaceId, teeEnabled: founded.teeEnabled, ...ha };
|
|
462
|
+
}
|
|
463
|
+
var HA_ACCOUNT_NOT_LINKED_MESSAGE = "link this account to your cloud user in the wallet so invitees can find this namespace";
|
|
464
|
+
var HA_REFUSAL_MESSAGES = {
|
|
465
|
+
account_not_linked: HA_ACCOUNT_NOT_LINKED_MESSAGE,
|
|
466
|
+
account_linked_to_several_users: "this account is linked to more than one cloud user, so the cloud cannot tell whose plan hosts the namespace: unlink it from all but one in the wallet",
|
|
467
|
+
ha_request_pending: "another namespace of this account is still waiting to be hosted; the cloud hosts one new namespace at a time without a cloud sign-in. Sign in to the cloud and turn off hosting for the waiting namespace, or wait until it is hosted",
|
|
468
|
+
unknown_relay: "the cloud does not run the relay this namespace was founded on, so it cannot host it",
|
|
469
|
+
relay_not_dialable: "the relay this namespace was founded on has not reported its address to the cloud yet; try enabling hosting again shortly"
|
|
470
|
+
};
|
|
471
|
+
function blockingNamespace(e) {
|
|
472
|
+
try {
|
|
473
|
+
const body = JSON.parse(e.bodyText ?? "");
|
|
474
|
+
const id = body?.detail?.namespace_id ?? body?.namespace_id;
|
|
475
|
+
return typeof id === "string" && /^[0-9a-f]{64}$/i.test(id) ? id.toLowerCase() : null;
|
|
476
|
+
} catch {
|
|
477
|
+
return null;
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
async function enableHaBestEffort(s, namespaceId, salt, relayUrl, deps) {
|
|
481
|
+
try {
|
|
482
|
+
await new meroJs.CloudClient({ cloudBaseUrl: deps.cloudBaseUrl, fetch: deps.fetch }).enableHaAsAccount({
|
|
483
|
+
namespaceId,
|
|
484
|
+
salt,
|
|
485
|
+
accountId: s.account,
|
|
486
|
+
credential: s.credential,
|
|
487
|
+
deviceSecret: s.deviceSecret,
|
|
488
|
+
// The relay that founded it: the cloud hands it to the fleet node as its
|
|
489
|
+
// admitter, so the node does not have to find it by discovery.
|
|
490
|
+
relayUrl
|
|
491
|
+
});
|
|
492
|
+
return { haEnabled: true };
|
|
493
|
+
} catch (e) {
|
|
494
|
+
if (e instanceof meroJs.AccountNotLinkedError) return { haEnabled: false, haError: HA_ACCOUNT_NOT_LINKED_MESSAGE };
|
|
495
|
+
if (e instanceof meroJs.AccountHaRefusedError && HA_REFUSAL_MESSAGES[e.code]) {
|
|
496
|
+
const blocking = e.code === "ha_request_pending" ? blockingNamespace(e) : null;
|
|
497
|
+
const message = HA_REFUSAL_MESSAGES[e.code];
|
|
498
|
+
return { haEnabled: false, haError: blocking ? `${message} (waiting: ${blocking})` : message };
|
|
499
|
+
}
|
|
500
|
+
return { haEnabled: false, haError: e instanceof Error ? e.message : String(e) };
|
|
501
|
+
}
|
|
458
502
|
}
|
|
459
503
|
async function latestPublishedVersion(registryUrl, pkg, fetchFn = globalThis.fetch) {
|
|
460
504
|
const url = `${registryUrl.replace(/\/+$/, "")}/api/v2/bundles?package=${encodeURIComponent(pkg)}`;
|
|
@@ -559,6 +603,16 @@ var NoRelayError = class extends Error {
|
|
|
559
603
|
this.name = "NoRelayError";
|
|
560
604
|
}
|
|
561
605
|
};
|
|
606
|
+
var InvitationNotClaimableError = class extends Error {
|
|
607
|
+
constructor(namespaceId, reason) {
|
|
608
|
+
super(
|
|
609
|
+
reason === "not-hosted" ? `nobody could claim an invitation to ${namespaceId} yet: the namespace is not hosted in the cloud, so an invitee with no node has no relay to be admitted through. Link this account to your cloud user in the wallet and enable HA for the namespace, then invite.` : `nobody could claim an invitation to ${namespaceId}: the cloud routes to none of the relays or admins it would name as admitters`
|
|
610
|
+
);
|
|
611
|
+
this.namespaceId = namespaceId;
|
|
612
|
+
this.reason = reason;
|
|
613
|
+
this.name = "InvitationNotClaimableError";
|
|
614
|
+
}
|
|
615
|
+
};
|
|
562
616
|
var EMPTY_READS = {
|
|
563
617
|
listNamespaces: async () => [],
|
|
564
618
|
listNamespacesForApplication: async () => [],
|
|
@@ -612,6 +666,7 @@ function createAccountAdmin(input, deps = {}) {
|
|
|
612
666
|
const latestVersion = deps.latestVersion ?? latestPublishedVersion;
|
|
613
667
|
const signInvitation = deps.signInvitation ?? meroJs.signGroupInvitation;
|
|
614
668
|
const join = deps.join;
|
|
669
|
+
const routing = deps.routing;
|
|
615
670
|
async function joinNamespace(namespaceId, req) {
|
|
616
671
|
if (!join) throw new NotForAccountError("joinNamespace without a join handler");
|
|
617
672
|
return join(namespaceId, req.invitation);
|
|
@@ -659,12 +714,12 @@ function createAccountAdmin(input, deps = {}) {
|
|
|
659
714
|
async createNamespace(req) {
|
|
660
715
|
if (!app.packageName) throw new NotForAccountError("createNamespace without a packageName");
|
|
661
716
|
const version = app.packageVersion ?? await latestVersion(app.registryUrl ?? "https://apps.calimero.network", app.packageName);
|
|
662
|
-
const { namespaceId } = await found(s, {
|
|
717
|
+
const { namespaceId, haEnabled, haError } = await found(s, {
|
|
663
718
|
defaultCapabilities: 231,
|
|
664
719
|
application: { applicationId: req.applicationId, package: app.packageName, version }
|
|
665
720
|
});
|
|
666
721
|
if (req.name) await group(s, namespaceId, meroJs.groupMetadataSetOp({ name: req.name }));
|
|
667
|
-
return { namespaceId };
|
|
722
|
+
return { namespaceId, haEnabled, ...haError !== void 0 ? { haError } : {} };
|
|
668
723
|
},
|
|
669
724
|
async createGroupInNamespace(namespaceId, req = {}) {
|
|
670
725
|
const { op } = await meroJs.subgroupCreation({ parentId: namespaceId, restricted: req.visibility !== "open", admin: s.account });
|
|
@@ -737,6 +792,22 @@ function createAccountAdmin(input, deps = {}) {
|
|
|
737
792
|
async createNamespaceInvitation(namespaceId) {
|
|
738
793
|
const [{ members }, info] = await Promise.all([relay().listGroupMembers(namespaceId), relay().getGroupInfo(namespaceId)]);
|
|
739
794
|
const relays = members.filter((m) => m.role === "RelayTee").map((m) => m.identity.toLowerCase());
|
|
795
|
+
if (routing) {
|
|
796
|
+
const named = new Set(
|
|
797
|
+
relays.length > 0 ? relays : members.filter((m) => m.role === "Admin").map((m) => m.identity.toLowerCase())
|
|
798
|
+
);
|
|
799
|
+
let nodes = null;
|
|
800
|
+
try {
|
|
801
|
+
nodes = (await routing(namespaceId)).nodes;
|
|
802
|
+
} catch {
|
|
803
|
+
}
|
|
804
|
+
if (nodes !== null) {
|
|
805
|
+
if (nodes.length === 0) throw new InvitationNotClaimableError(namespaceId, "not-hosted");
|
|
806
|
+
if (!nodes.some((n) => n.account !== null && named.has(n.account.toLowerCase()))) {
|
|
807
|
+
throw new InvitationNotClaimableError(namespaceId, "no-named-node");
|
|
808
|
+
}
|
|
809
|
+
}
|
|
810
|
+
}
|
|
740
811
|
const invitation = await signInvitation({
|
|
741
812
|
groupId: namespaceId,
|
|
742
813
|
inviterAccount: s.account,
|
|
@@ -1558,7 +1629,14 @@ function MeroProvider({
|
|
|
1558
1629
|
const app = { packageName, packageVersion, registryUrl };
|
|
1559
1630
|
if (delegated !== null) {
|
|
1560
1631
|
const deps = {
|
|
1561
|
-
join: (namespaceId, invitation) => joinAsAccount(delegated, namespaceId, invitation, { cloudBaseUrl, onJoined: connectWithAccount })
|
|
1632
|
+
join: (namespaceId, invitation) => joinAsAccount(delegated, namespaceId, invitation, { cloudBaseUrl, onJoined: connectWithAccount }),
|
|
1633
|
+
// Founding enables HA on the same cloud the joins resolve relays from.
|
|
1634
|
+
found: (session, req) => foundDelegatedNamespace(session, req, { cloudBaseUrl }),
|
|
1635
|
+
// Invitations are checked against the routing their claimants will use.
|
|
1636
|
+
routing: (namespaceId) => new meroJs.CloudClient({
|
|
1637
|
+
cloudBaseUrl,
|
|
1638
|
+
routingCredential: { credential: delegated.credential, deviceSecret: delegated.deviceSecret }
|
|
1639
|
+
}).getNamespaceRouting(namespaceId)
|
|
1562
1640
|
};
|
|
1563
1641
|
if (delegated.relayUrl === null) return createAccountAdmin({ session: delegated, read: null, app }, deps);
|
|
1564
1642
|
if (!mero) return null;
|
|
@@ -3734,7 +3812,7 @@ function useNamespacesForApplication(applicationId) {
|
|
|
3734
3812
|
}
|
|
3735
3813
|
var DEFAULT_REGISTRY_URL = "https://apps.calimero.network";
|
|
3736
3814
|
function useCreateNamespace() {
|
|
3737
|
-
const { mero, isDelegated, app } = useMero();
|
|
3815
|
+
const { mero, isDelegated, app, cloudBaseUrl } = useMero();
|
|
3738
3816
|
const { loading, error, run } = useAsyncMutation();
|
|
3739
3817
|
const createNamespace = react.useCallback(
|
|
3740
3818
|
async (request) => {
|
|
@@ -3747,16 +3825,20 @@ function useCreateNamespace() {
|
|
|
3747
3825
|
throw new Error("this app names no registry package, so a founded namespace could not be given its application");
|
|
3748
3826
|
}
|
|
3749
3827
|
const version = app.packageVersion ?? await latestPublishedVersion(app.registryUrl ?? DEFAULT_REGISTRY_URL, pkg);
|
|
3750
|
-
return foundDelegatedNamespace(
|
|
3751
|
-
|
|
3752
|
-
|
|
3753
|
-
|
|
3828
|
+
return foundDelegatedNamespace(
|
|
3829
|
+
session,
|
|
3830
|
+
{
|
|
3831
|
+
defaultCapabilities: 231,
|
|
3832
|
+
application: { applicationId: request.applicationId, package: pkg, version }
|
|
3833
|
+
},
|
|
3834
|
+
{ cloudBaseUrl }
|
|
3835
|
+
);
|
|
3754
3836
|
});
|
|
3755
3837
|
}
|
|
3756
3838
|
if (!mero) return null;
|
|
3757
3839
|
return run(() => mero.admin.createNamespace(request));
|
|
3758
3840
|
},
|
|
3759
|
-
[mero, run, isDelegated, app]
|
|
3841
|
+
[mero, run, isDelegated, app, cloudBaseUrl]
|
|
3760
3842
|
);
|
|
3761
3843
|
return { createNamespace, loading, error };
|
|
3762
3844
|
}
|
|
@@ -4912,6 +4994,9 @@ exports.ConnectButton = ConnectButton;
|
|
|
4912
4994
|
exports.ConnectButtonAccount = ConnectButtonAccount;
|
|
4913
4995
|
exports.ConnectionType = ConnectionType;
|
|
4914
4996
|
exports.DEFAULT_MIGRATION_POLL_INTERVAL_MS = DEFAULT_MIGRATION_POLL_INTERVAL_MS;
|
|
4997
|
+
exports.HA_ACCOUNT_NOT_LINKED_MESSAGE = HA_ACCOUNT_NOT_LINKED_MESSAGE;
|
|
4998
|
+
exports.HA_REFUSAL_MESSAGES = HA_REFUSAL_MESSAGES;
|
|
4999
|
+
exports.InvitationNotClaimableError = InvitationNotClaimableError;
|
|
4915
5000
|
exports.LoginModal = LoginModal;
|
|
4916
5001
|
exports.MERO_CSS_VARS = MERO_CSS_VARS;
|
|
4917
5002
|
exports.MeroContext = MeroContext;
|