@le-space/ui 0.3.17 → 0.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/ui",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "Floating Aleph sponsor relay UI components for Svelte and React.",
   "license": "MIT",
   "type": "module",
@@ -36,8 +36,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@le-space/browser": "0.3.17",
-    "@le-space/core": "0.3.17",
+    "@le-space/browser": "0.3.18",
+    "@le-space/core": "0.3.18",
     "viem": "^2.38.5"
   },
   "peerDependencies": {

package/react/index.js

@@ -39,7 +39,7 @@ var RECENT_INSTANCE_RUNTIME_GRACE_MS = 10 * 60 * 1e3;
 var DEPLOYMENT_PENDING_WARNING_MS = 3 * 60 * 1e3;
 
 // src/shared/package-version.ts
-var UI_PACKAGE_VERSION = "0.3.17";
+var UI_PACKAGE_VERSION = "0.3.18";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -1219,14 +1219,14 @@ async function inspectDeploymentResult2(itemHash, options) {
 async function waitForDeploymentResult2(itemHash, options) {
   const attempts = Math.max(1, Number(options.attempts ?? 15));
   const delayMs = Math.max(0, Number(options.delayMs ?? 2e3));
-  const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastResult = await inspectDeploymentResult2(itemHash, options);
   options.onAttempt?.(lastResult, 1, attempts);
   for (let attempt = 1; attempt < attempts; attempt += 1) {
     if (lastResult.status === "processed" || lastResult.status === "rejected") {
       return lastResult;
     }
-    await sleep(delayMs);
+    await sleep2(delayMs);
     lastResult = await inspectDeploymentResult2(itemHash, options);
     options.onAttempt?.(lastResult, attempt + 1, attempts);
   }
@@ -1884,14 +1884,14 @@ async function fetchVmRuntime(args) {
 async function waitForVmRuntime(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 20));
   const delayMs = Math.max(0, Number(args.delayMs ?? 4e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastRuntime = await fetchVmRuntime(args);
   args.onAttempt?.(lastRuntime, 1, attempts);
   for (let attempt = 0; attempt < attempts - 1; attempt += 1) {
     if (lastRuntime.hostIpv4 && Object.keys(lastRuntime.mappedPorts ?? {}).length > 0) {
       return lastRuntime;
     }
-    await sleep(delayMs);
+    await sleep2(delayMs);
     lastRuntime = await fetchVmRuntime(args);
     args.onAttempt?.(lastRuntime, attempt + 2, attempts);
   }
@@ -1970,7 +1970,7 @@ function isRetryableAllocationNotifyReason(reason) {
 async function notifyCrnAllocationWithRetry(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 6));
   const delayMs = Math.max(0, Number(args.delayMs ?? 2e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastResult = null;
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     args.onProgress?.({
@@ -1996,7 +1996,7 @@ async function notifyCrnAllocationWithRetry(args) {
       return result;
     }
     if (attempt < attempts - 1) {
-      await sleep(delayMs);
+      await sleep2(delayMs);
     }
   }
   return lastResult ?? {
@@ -2007,7 +2007,7 @@ async function notifyCrnAllocationWithRetry(args) {
 async function waitForSetupEndpoint(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 15));
   const delayMs = Math.max(0, Number(args.delayMs ?? 4e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const url = `http://${args.hostIpv4}:${args.setupPort}/health`;
   let result = await defaultHttpProbe(
     args.fetch,
@@ -2017,7 +2017,7 @@ async function waitForSetupEndpoint(args) {
   args.onAttempt?.(result, 1, attempts);
   for (let attempt = 1; attempt < attempts; attempt += 1) {
     if (result.ok) return result;
-    await sleep(delayMs);
+    await sleep2(delayMs);
     result = await defaultHttpProbe(
       args.fetch,
       url,
@@ -2076,7 +2076,7 @@ async function configureOrbitdbRelaySetup2(args) {
 async function fetchUcGoPeerMetadata(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 60));
   const delayMs = Math.max(0, Number(args.delayMs ?? 3e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastPayload = null;
   let lastError = null;
   for (let attempt = 0; attempt < attempts; attempt += 1) {
@@ -2136,7 +2136,7 @@ async function fetchUcGoPeerMetadata(args) {
       clearTimeout(timeout);
     }
     if (attempt < attempts - 1) {
-      await sleep(delayMs);
+      await sleep2(delayMs);
     }
   }
   throw new Error(
@@ -2531,6 +2531,51 @@ function selectCurrentRelayBootstrapPosts(posts, options = {}) {
 }
 
 // ../core/src/bootstrap-registration.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function waitForRelayBootstrapRegistration(args) {
+  const attempts = Math.max(1, Number(args.attempts ?? 10));
+  const delayMs = Math.max(0, Number(args.delayMs ?? 2e3));
+  const expectedSender = args.sender.trim().toLowerCase();
+  const expectedRegistrationId = args.registrationId?.trim() || null;
+  const expectedPeerId = args.peerId?.trim() || null;
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    const posts = await fetchAlephBootstrapPosts({
+      apiHost: args.apiHost ?? DEFAULT_ALEPH_API_HOST3,
+      channel: args.channel,
+      ref: args.ref,
+      postType: args.postType,
+      fetch: args.fetch
+    });
+    const currentPosts = selectCurrentRelayBootstrapPosts(posts);
+    const match = currentPosts.find((post) => {
+      const senderMatches = post.address?.toLowerCase() === expectedSender;
+      if (!senderMatches) return false;
+      if (expectedRegistrationId && post.content?.registrationId === expectedRegistrationId) {
+        return true;
+      }
+      if (expectedPeerId && post.content?.peerId === expectedPeerId) {
+        return true;
+      }
+      return false;
+    });
+    if (match?.content) {
+      return {
+        itemHash: match.itemHash ?? null,
+        hash: match.hash ?? null,
+        registrationId: match.content.registrationId,
+        peerId: match.content.peerId,
+        multiaddrs: Array.isArray(match.content.multiaddrs) ? match.content.multiaddrs : [],
+        browserMultiaddrs: Array.isArray(match.content.browserMultiaddrs) ? match.content.browserMultiaddrs : []
+      };
+    }
+    if (attempt < attempts - 1) {
+      await sleep(delayMs);
+    }
+  }
+  return null;
+}
 async function publishRelayBootstrapRegistration(args) {
   const publisherAddress = args.publisherAddress ?? args.sender;
   const ownerAddress = args.ownerAddress;
@@ -3602,6 +3647,34 @@ var SponsorRelayController = class {
       metadata: relayMetadata,
       publication
     });
+    this.emitProgress({
+      stage: "publishing-bootstrap",
+      label: "Verifying bootstrap registration",
+      progress: 97,
+      status: "info",
+      itemHash: args.itemHash,
+      detail: "Waiting for the relay bootstrap registration to appear on Aleph."
+    });
+    const visibleRegistration = await waitForRelayBootstrapRegistration({
+      sender: this.state.wallet.address,
+      registrationId,
+      peerId,
+      fetch: asJsonFetch,
+      apiHost: this.client.apiHost,
+      attempts: 12,
+      delayMs: 2500
+    });
+    this.trace("deploy:bootstrap-registration-visible", {
+      itemHash: args.itemHash,
+      registrationId,
+      peerId,
+      visibleRegistration
+    });
+    if (!visibleRegistration) {
+      throw new Error(
+        "Relay bootstrap registration did not become visible on Aleph."
+      );
+    }
     const reconcileResult = await reconcileOwnerRelayBootstrapRegistrations({
       instanceOwnerAddress: this.state.wallet.address,
       sender: this.state.wallet.address,
@@ -4116,12 +4189,14 @@ var SponsorRelayController = class {
       for (const [candidateIndex, candidateCrn] of orderedCrns.entries()) {
         let attemptItemHash = null;
         let attemptDeploymentToken = null;
+        const crnAttemptLabel = `CRN ${candidateIndex + 1}/${orderedCrns.length}`;
+        const crnDisplayName = candidateCrn.name ?? candidateCrn.hash;
         this.emitProgress({
           stage: "selecting-crn",
-          label: "Selecting CRN",
+          label: `Selecting ${crnAttemptLabel}`,
           progress: 18,
           status: "info",
-          detail: `Trying ${candidateCrn.name ?? candidateCrn.hash} (${candidateIndex + 1}/${orderedCrns.length})`
+          detail: `Trying ${crnDisplayName}`
         });
         try {
           const profile = relayProfileForManifest(this.state.manifest);
@@ -4331,7 +4406,7 @@ var SponsorRelayController = class {
           return;
         } catch (error) {
           lastError = error instanceof Error ? error : new Error(String(error));
-          const attemptLabel = candidateCrn.name ?? candidateCrn.hash;
+          const attemptLabel = crnDisplayName;
           attemptErrors.push(`${attemptLabel}: ${lastError.message}`);
           this.trace("deploy:crn-attempt-error", {
             crnHash: candidateCrn.hash,
@@ -4400,7 +4475,7 @@ var SponsorRelayController = class {
           if (candidateIndex < orderedCrns.length - 1) {
             this.emitProgress({
               stage: "selecting-crn",
-              label: "Retrying another CRN",
+              label: `Retrying after ${crnAttemptLabel}`,
               progress: 20,
               status: "warning",
               itemHash: attemptItemHash,

package/shared/index.d.ts

@@ -304,7 +304,7 @@ declare const STALE_INSTANCE_ALLOCATION_COOLDOWN_MS: number;
 declare const RECENT_INSTANCE_RUNTIME_GRACE_MS: number;
 declare const DEPLOYMENT_PENDING_WARNING_MS: number;
 
-declare const UI_PACKAGE_VERSION = "0.3.17";
+declare const UI_PACKAGE_VERSION = "0.3.18";
 
 interface RootfsRequiredPortForward {
     port: number;

package/shared/index.js

@@ -38,7 +38,7 @@ var RECENT_INSTANCE_RUNTIME_GRACE_MS = 10 * 60 * 1e3;
 var DEPLOYMENT_PENDING_WARNING_MS = 3 * 60 * 1e3;
 
 // src/shared/package-version.ts
-var UI_PACKAGE_VERSION = "0.3.17";
+var UI_PACKAGE_VERSION = "0.3.18";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -1218,14 +1218,14 @@ async function inspectDeploymentResult2(itemHash, options) {
 async function waitForDeploymentResult2(itemHash, options) {
   const attempts = Math.max(1, Number(options.attempts ?? 15));
   const delayMs = Math.max(0, Number(options.delayMs ?? 2e3));
-  const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastResult = await inspectDeploymentResult2(itemHash, options);
   options.onAttempt?.(lastResult, 1, attempts);
   for (let attempt = 1; attempt < attempts; attempt += 1) {
     if (lastResult.status === "processed" || lastResult.status === "rejected") {
       return lastResult;
     }
-    await sleep(delayMs);
+    await sleep2(delayMs);
     lastResult = await inspectDeploymentResult2(itemHash, options);
     options.onAttempt?.(lastResult, attempt + 1, attempts);
   }
@@ -1883,14 +1883,14 @@ async function fetchVmRuntime(args) {
 async function waitForVmRuntime(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 20));
   const delayMs = Math.max(0, Number(args.delayMs ?? 4e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastRuntime = await fetchVmRuntime(args);
   args.onAttempt?.(lastRuntime, 1, attempts);
   for (let attempt = 0; attempt < attempts - 1; attempt += 1) {
     if (lastRuntime.hostIpv4 && Object.keys(lastRuntime.mappedPorts ?? {}).length > 0) {
       return lastRuntime;
     }
-    await sleep(delayMs);
+    await sleep2(delayMs);
     lastRuntime = await fetchVmRuntime(args);
     args.onAttempt?.(lastRuntime, attempt + 2, attempts);
   }
@@ -1969,7 +1969,7 @@ function isRetryableAllocationNotifyReason(reason) {
 async function notifyCrnAllocationWithRetry(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 6));
   const delayMs = Math.max(0, Number(args.delayMs ?? 2e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastResult = null;
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     args.onProgress?.({
@@ -1995,7 +1995,7 @@ async function notifyCrnAllocationWithRetry(args) {
       return result;
     }
     if (attempt < attempts - 1) {
-      await sleep(delayMs);
+      await sleep2(delayMs);
     }
   }
   return lastResult ?? {
@@ -2006,7 +2006,7 @@ async function notifyCrnAllocationWithRetry(args) {
 async function waitForSetupEndpoint(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 15));
   const delayMs = Math.max(0, Number(args.delayMs ?? 4e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const url = `http://${args.hostIpv4}:${args.setupPort}/health`;
   let result = await defaultHttpProbe(
     args.fetch,
@@ -2016,7 +2016,7 @@ async function waitForSetupEndpoint(args) {
   args.onAttempt?.(result, 1, attempts);
   for (let attempt = 1; attempt < attempts; attempt += 1) {
     if (result.ok) return result;
-    await sleep(delayMs);
+    await sleep2(delayMs);
     result = await defaultHttpProbe(
       args.fetch,
       url,
@@ -2075,7 +2075,7 @@ async function configureOrbitdbRelaySetup2(args) {
 async function fetchUcGoPeerMetadata(args) {
   const attempts = Math.max(1, Number(args.attempts ?? 60));
   const delayMs = Math.max(0, Number(args.delayMs ?? 3e3));
-  const sleep = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = args.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   let lastPayload = null;
   let lastError = null;
   for (let attempt = 0; attempt < attempts; attempt += 1) {
@@ -2135,7 +2135,7 @@ async function fetchUcGoPeerMetadata(args) {
       clearTimeout(timeout);
     }
     if (attempt < attempts - 1) {
-      await sleep(delayMs);
+      await sleep2(delayMs);
     }
   }
   throw new Error(
@@ -2530,6 +2530,51 @@ function selectCurrentRelayBootstrapPosts(posts, options = {}) {
 }
 
 // ../core/src/bootstrap-registration.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function waitForRelayBootstrapRegistration(args) {
+  const attempts = Math.max(1, Number(args.attempts ?? 10));
+  const delayMs = Math.max(0, Number(args.delayMs ?? 2e3));
+  const expectedSender = args.sender.trim().toLowerCase();
+  const expectedRegistrationId = args.registrationId?.trim() || null;
+  const expectedPeerId = args.peerId?.trim() || null;
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    const posts = await fetchAlephBootstrapPosts({
+      apiHost: args.apiHost ?? DEFAULT_ALEPH_API_HOST3,
+      channel: args.channel,
+      ref: args.ref,
+      postType: args.postType,
+      fetch: args.fetch
+    });
+    const currentPosts = selectCurrentRelayBootstrapPosts(posts);
+    const match = currentPosts.find((post) => {
+      const senderMatches = post.address?.toLowerCase() === expectedSender;
+      if (!senderMatches) return false;
+      if (expectedRegistrationId && post.content?.registrationId === expectedRegistrationId) {
+        return true;
+      }
+      if (expectedPeerId && post.content?.peerId === expectedPeerId) {
+        return true;
+      }
+      return false;
+    });
+    if (match?.content) {
+      return {
+        itemHash: match.itemHash ?? null,
+        hash: match.hash ?? null,
+        registrationId: match.content.registrationId,
+        peerId: match.content.peerId,
+        multiaddrs: Array.isArray(match.content.multiaddrs) ? match.content.multiaddrs : [],
+        browserMultiaddrs: Array.isArray(match.content.browserMultiaddrs) ? match.content.browserMultiaddrs : []
+      };
+    }
+    if (attempt < attempts - 1) {
+      await sleep(delayMs);
+    }
+  }
+  return null;
+}
 async function publishRelayBootstrapRegistration(args) {
   const publisherAddress = args.publisherAddress ?? args.sender;
   const ownerAddress = args.ownerAddress;
@@ -3601,6 +3646,34 @@ var SponsorRelayController = class {
       metadata: relayMetadata,
       publication
     });
+    this.emitProgress({
+      stage: "publishing-bootstrap",
+      label: "Verifying bootstrap registration",
+      progress: 97,
+      status: "info",
+      itemHash: args.itemHash,
+      detail: "Waiting for the relay bootstrap registration to appear on Aleph."
+    });
+    const visibleRegistration = await waitForRelayBootstrapRegistration({
+      sender: this.state.wallet.address,
+      registrationId,
+      peerId,
+      fetch: asJsonFetch,
+      apiHost: this.client.apiHost,
+      attempts: 12,
+      delayMs: 2500
+    });
+    this.trace("deploy:bootstrap-registration-visible", {
+      itemHash: args.itemHash,
+      registrationId,
+      peerId,
+      visibleRegistration
+    });
+    if (!visibleRegistration) {
+      throw new Error(
+        "Relay bootstrap registration did not become visible on Aleph."
+      );
+    }
     const reconcileResult = await reconcileOwnerRelayBootstrapRegistrations({
       instanceOwnerAddress: this.state.wallet.address,
       sender: this.state.wallet.address,
@@ -4115,12 +4188,14 @@ var SponsorRelayController = class {
       for (const [candidateIndex, candidateCrn] of orderedCrns.entries()) {
         let attemptItemHash = null;
         let attemptDeploymentToken = null;
+        const crnAttemptLabel = `CRN ${candidateIndex + 1}/${orderedCrns.length}`;
+        const crnDisplayName = candidateCrn.name ?? candidateCrn.hash;
         this.emitProgress({
           stage: "selecting-crn",
-          label: "Selecting CRN",
+          label: `Selecting ${crnAttemptLabel}`,
           progress: 18,
           status: "info",
-          detail: `Trying ${candidateCrn.name ?? candidateCrn.hash} (${candidateIndex + 1}/${orderedCrns.length})`
+          detail: `Trying ${crnDisplayName}`
         });
         try {
           const profile = relayProfileForManifest(this.state.manifest);
@@ -4330,7 +4405,7 @@ var SponsorRelayController = class {
           return;
         } catch (error) {
           lastError = error instanceof Error ? error : new Error(String(error));
-          const attemptLabel = candidateCrn.name ?? candidateCrn.hash;
+          const attemptLabel = crnDisplayName;
           attemptErrors.push(`${attemptLabel}: ${lastError.message}`);
           this.trace("deploy:crn-attempt-error", {
             crnHash: candidateCrn.hash,
@@ -4399,7 +4474,7 @@ var SponsorRelayController = class {
           if (candidateIndex < orderedCrns.length - 1) {
             this.emitProgress({
               stage: "selecting-crn",
-              label: "Retrying another CRN",
+              label: `Retrying after ${crnAttemptLabel}`,
               progress: 20,
               status: "warning",
               itemHash: attemptItemHash,