@le-space/ui 0.4.3 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/ui",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "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.4.3",
-    "@le-space/core": "0.4.3",
+    "@le-space/browser": "0.4.4",
+    "@le-space/core": "0.4.4",
     "viem": "^2.38.5"
   },
   "peerDependencies": {

package/react/index.js

@@ -28,7 +28,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.4.3";
+var UI_PACKAGE_VERSION = "0.4.4";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -3201,7 +3201,7 @@ function rootfsHealth(args) {
     return {
       tone: "error",
       label: "not found on Aleph",
-      detail: "The referenced rootfs STORE message is not available yet."
+      detail: "The manifest points to a rootfs STORE message that Aleph cannot find. Check that the manifest URL is correct and that the referenced rootfs was not forgotten."
     };
   }
   if (!args.resolution) {
@@ -3234,8 +3234,8 @@ function rootfsHealth(args) {
   }
   return {
     tone: "error",
-    label: "not deployable",
-    detail: args.resolution.rejectionReason ?? "Aleph rejected the rootfs reference."
+    label: "manifest rootfs not deployable",
+    detail: args.resolution.rejectionReason ?? (args.resolution.messageType === "STORE" ? "This manifest points to a rootfs STORE message that exists but is not deployable anymore, for example because it was forgotten or replaced. Double-check the manifest URL." : "Aleph rejected the rootfs reference. Double-check that the manifest URL points to the intended current rootfs.")
   };
 }
 async function resolveManifest(args) {
@@ -3795,6 +3795,16 @@ var SponsorRelayController = class {
       });
     }
     if (!relayMetadata) {
+      await this.refresh().catch(() => void 0);
+      const confirmedAfterRefresh = this.state.bootstrapRegistrations.some(
+        (entry) => entry.instanceItemHash === args.itemHash && entry.confirmed
+      );
+      if (confirmedAfterRefresh) {
+        this.trace("deploy:relay-metadata-recovered-from-refresh", {
+          itemHash: args.itemHash
+        });
+        return;
+      }
       throw new Error("Relay metadata did not include a peer ID and public multiaddrs.");
     }
     const { peerId } = relayMetadata;
@@ -4071,6 +4081,20 @@ var SponsorRelayController = class {
       });
       return;
     }
+    const hasConfirmedBootstrapRegistration = this.state.bootstrapRegistrations.some(
+      (entry) => entry.instanceItemHash === itemHash && entry.confirmed
+    );
+    if (hasConfirmedBootstrapRegistration) {
+      this.emitProgress({
+        stage: "completed",
+        label: "Relay ready",
+        progress: 100,
+        status: "success",
+        itemHash,
+        detail: "Runtime networking is available and the relay bootstrap registration is confirmed on Aleph."
+      });
+      return;
+    }
     this.emitProgress({
       stage: "deployment-confirmed",
       label: "Runtime ready",
@@ -4467,9 +4491,9 @@ var SponsorRelayController = class {
       this.patch({ errorText: "Connect MetaMask before deploying." });
       return;
     }
-    if (!this.state.manifest || !this.state.rootfsVerified || !this.state.pricingSummary.pricing || !this.state.pricingSummary.tier) {
+    if (!this.state.manifest || this.state.rootfsHealth.tone !== "ok" || !this.state.pricingSummary.pricing || !this.state.pricingSummary.tier) {
       this.patch({
-        errorText: "Manifest, rootfs, and pricing must be ready before deploying."
+        errorText: this.state.rootfsHealth.tone === "error" ? `Cannot deploy: ${this.state.rootfsHealth.detail ?? this.state.rootfsHealth.label}` : "Manifest, rootfs, and pricing must be ready before deploying."
       });
       return;
     }
@@ -4511,6 +4535,7 @@ var SponsorRelayController = class {
       for (const [candidateIndex, candidateCrn] of orderedCrns.entries()) {
         let attemptItemHash = null;
         let attemptDeploymentToken = null;
+        let attemptProfile = null;
         const crnAttemptLabel = `CRN ${candidateIndex + 1}/${orderedCrns.length}`;
         const crnDisplayName = candidateCrn.name ?? candidateCrn.hash;
         this.emitProgress({
@@ -4522,6 +4547,7 @@ var SponsorRelayController = class {
         });
         try {
           const profile = relayProfileForManifest(this.state.manifest);
+          attemptProfile = profile;
           const sshPublicKey = profile === "uc-go-peer" ? appendDeploymentTokenToSshPublicKey(
             this.state.sshPublicKey.trim(),
             this.state.wallet.address,
@@ -4757,6 +4783,106 @@ var SponsorRelayController = class {
             itemHash: attemptItemHash,
             error: lastError.message
           });
+          if (attemptItemHash && attemptDeploymentToken && attemptProfile && !failedDueToInvalidIpv6) {
+            try {
+              const latestRuntime = await fetchVmRuntime({
+                itemHash: attemptItemHash,
+                fetch: (url, init) => fetch(url, init),
+                crnHash: candidateCrn.hash,
+                crns: this.state.crns,
+                crnListUrl: this.props.crnListUrl,
+                requirePublicGuestIpv6ForProxy: true
+              });
+              if (latestRuntime.diagnostics?.state === "ready") {
+                const reconciledRelayMetadata = await fetchRelayMetadataForRuntime({
+                  runtime: latestRuntime,
+                  fetch: (url, init) => fetch(url, init),
+                  preferSecureMetadata: attemptProfile === "uc-go-peer" && Boolean(latestRuntime.proxyUrl),
+                  attempts: 3,
+                  delayMs: 1e3,
+                  timeoutMs: 15e3
+                }).catch(() => null);
+                if (reconciledRelayMetadata) {
+                  const registrationId = createRelayBootstrapRegistrationId(
+                    attemptProfile,
+                    this.state.instanceName.trim(),
+                    attemptItemHash
+                  );
+                  const visibleRegistration = await waitForRelayBootstrapRegistration({
+                    registrationId,
+                    peerId: reconciledRelayMetadata.peerId,
+                    fetch: asJsonFetch,
+                    apiHost: this.client.apiHost,
+                    attempts: 3,
+                    delayMs: 1e3
+                  }).catch(() => null);
+                  if (visibleRegistration) {
+                    this.trace("deploy:recovered-after-error", {
+                      itemHash: attemptItemHash,
+                      registrationId,
+                      peerId: reconciledRelayMetadata.peerId,
+                      error: lastError.message
+                    });
+                    this.rememberRuntimeDetails(attemptItemHash, {
+                      messageStatus: "processed",
+                      allocationSource: latestRuntime.allocation?.source ?? null,
+                      crnUrl: latestRuntime.allocation?.crnUrl ?? latestRuntime.execution?.crnUrl ?? null,
+                      hostIpv4: latestRuntime.hostIpv4 ?? null,
+                      ipv6: latestRuntime.ipv6 ?? null,
+                      vmIpv4: latestRuntime.execution?.networking?.ipv4_ip ?? null,
+                      webUrl: latestRuntime.webAccessUrl ?? latestRuntime.proxyUrl ?? latestRuntime.execution?.networking?.proxy_url ?? null,
+                      sshCommand: latestRuntime.sshCommand ?? null,
+                      mappedPorts: latestRuntime.execution != null ? mappedPorts(latestRuntime.execution) : runtimeMappedPorts(latestRuntime.mappedPorts),
+                      execution: latestRuntime.execution ?? null,
+                      error: null
+                    });
+                    this.patch({
+                      busy: { deploying: false }
+                    });
+                    await this.refresh();
+                    this.lastCompletedDeploymentHash = attemptItemHash;
+                    this.emitProgress({
+                      stage: "completed",
+                      label: "Relay ready",
+                      progress: 100,
+                      status: "success",
+                      itemHash: attemptItemHash,
+                      detail: "The relay completed startup after a transient UI polling error. Runtime and bootstrap registration are confirmed."
+                    });
+                    return;
+                  }
+                }
+              }
+            } catch (reconcileError) {
+              this.trace("deploy:recovery-check-error", {
+                itemHash: attemptItemHash,
+                error: reconcileError instanceof Error ? reconcileError.message : String(reconcileError)
+              });
+            }
+            await this.refresh().catch(() => void 0);
+            const recoveredRegistration = this.state.bootstrapRegistrations.some(
+              (entry) => entry.instanceItemHash === attemptItemHash && entry.confirmed
+            );
+            if (recoveredRegistration) {
+              this.trace("deploy:recovered-from-refresh-state", {
+                itemHash: attemptItemHash,
+                error: lastError.message
+              });
+              this.patch({
+                busy: { deploying: false }
+              });
+              this.lastCompletedDeploymentHash = attemptItemHash;
+              this.emitProgress({
+                stage: "completed",
+                label: "Relay ready",
+                progress: 100,
+                status: "success",
+                itemHash: attemptItemHash,
+                detail: "The relay completed startup after a transient browser-side polling error. Runtime and bootstrap registration are confirmed."
+              });
+              return;
+            }
+          }
           if (attemptItemHash) {
             this.emitProgress({
               stage: "deployment-confirmed",
@@ -5912,6 +6038,7 @@ function SponsorRelayFab(props) {
           {
             type: "button",
             onClick: () => void (state.wallet.connected ? controller.deploy() : controller.connectWallet()),
+            disabled: state.wallet.connected ? state.busy.deploying || state.rootfsHealth.tone !== "ok" : state.busy.connectingWallet,
             style: { ...primaryButtonStyle, width: "100%", marginTop: "1rem" },
             children: state.wallet.connected ? state.busy.deploying ? "Deploying\u2026" : "Deploy Relay" : "Connect MetaMask"
           }

package/shared/index.d.ts

@@ -311,7 +311,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.4.3";
+declare const UI_PACKAGE_VERSION = "0.4.4";
 
 interface RootfsRequiredPortForward {
     port: number;

package/shared/index.js

@@ -27,7 +27,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.4.3";
+var UI_PACKAGE_VERSION = "0.4.4";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -3200,7 +3200,7 @@ function rootfsHealth(args) {
     return {
       tone: "error",
       label: "not found on Aleph",
-      detail: "The referenced rootfs STORE message is not available yet."
+      detail: "The manifest points to a rootfs STORE message that Aleph cannot find. Check that the manifest URL is correct and that the referenced rootfs was not forgotten."
     };
   }
   if (!args.resolution) {
@@ -3233,8 +3233,8 @@ function rootfsHealth(args) {
   }
   return {
     tone: "error",
-    label: "not deployable",
-    detail: args.resolution.rejectionReason ?? "Aleph rejected the rootfs reference."
+    label: "manifest rootfs not deployable",
+    detail: args.resolution.rejectionReason ?? (args.resolution.messageType === "STORE" ? "This manifest points to a rootfs STORE message that exists but is not deployable anymore, for example because it was forgotten or replaced. Double-check the manifest URL." : "Aleph rejected the rootfs reference. Double-check that the manifest URL points to the intended current rootfs.")
   };
 }
 async function resolveManifest(args) {
@@ -3794,6 +3794,16 @@ var SponsorRelayController = class {
       });
     }
     if (!relayMetadata) {
+      await this.refresh().catch(() => void 0);
+      const confirmedAfterRefresh = this.state.bootstrapRegistrations.some(
+        (entry) => entry.instanceItemHash === args.itemHash && entry.confirmed
+      );
+      if (confirmedAfterRefresh) {
+        this.trace("deploy:relay-metadata-recovered-from-refresh", {
+          itemHash: args.itemHash
+        });
+        return;
+      }
       throw new Error("Relay metadata did not include a peer ID and public multiaddrs.");
     }
     const { peerId } = relayMetadata;
@@ -4070,6 +4080,20 @@ var SponsorRelayController = class {
       });
       return;
     }
+    const hasConfirmedBootstrapRegistration = this.state.bootstrapRegistrations.some(
+      (entry) => entry.instanceItemHash === itemHash && entry.confirmed
+    );
+    if (hasConfirmedBootstrapRegistration) {
+      this.emitProgress({
+        stage: "completed",
+        label: "Relay ready",
+        progress: 100,
+        status: "success",
+        itemHash,
+        detail: "Runtime networking is available and the relay bootstrap registration is confirmed on Aleph."
+      });
+      return;
+    }
     this.emitProgress({
       stage: "deployment-confirmed",
       label: "Runtime ready",
@@ -4466,9 +4490,9 @@ var SponsorRelayController = class {
       this.patch({ errorText: "Connect MetaMask before deploying." });
       return;
     }
-    if (!this.state.manifest || !this.state.rootfsVerified || !this.state.pricingSummary.pricing || !this.state.pricingSummary.tier) {
+    if (!this.state.manifest || this.state.rootfsHealth.tone !== "ok" || !this.state.pricingSummary.pricing || !this.state.pricingSummary.tier) {
       this.patch({
-        errorText: "Manifest, rootfs, and pricing must be ready before deploying."
+        errorText: this.state.rootfsHealth.tone === "error" ? `Cannot deploy: ${this.state.rootfsHealth.detail ?? this.state.rootfsHealth.label}` : "Manifest, rootfs, and pricing must be ready before deploying."
       });
       return;
     }
@@ -4510,6 +4534,7 @@ var SponsorRelayController = class {
       for (const [candidateIndex, candidateCrn] of orderedCrns.entries()) {
         let attemptItemHash = null;
         let attemptDeploymentToken = null;
+        let attemptProfile = null;
         const crnAttemptLabel = `CRN ${candidateIndex + 1}/${orderedCrns.length}`;
         const crnDisplayName = candidateCrn.name ?? candidateCrn.hash;
         this.emitProgress({
@@ -4521,6 +4546,7 @@ var SponsorRelayController = class {
         });
         try {
           const profile = relayProfileForManifest(this.state.manifest);
+          attemptProfile = profile;
           const sshPublicKey = profile === "uc-go-peer" ? appendDeploymentTokenToSshPublicKey(
             this.state.sshPublicKey.trim(),
             this.state.wallet.address,
@@ -4756,6 +4782,106 @@ var SponsorRelayController = class {
             itemHash: attemptItemHash,
             error: lastError.message
           });
+          if (attemptItemHash && attemptDeploymentToken && attemptProfile && !failedDueToInvalidIpv6) {
+            try {
+              const latestRuntime = await fetchVmRuntime({
+                itemHash: attemptItemHash,
+                fetch: (url, init) => fetch(url, init),
+                crnHash: candidateCrn.hash,
+                crns: this.state.crns,
+                crnListUrl: this.props.crnListUrl,
+                requirePublicGuestIpv6ForProxy: true
+              });
+              if (latestRuntime.diagnostics?.state === "ready") {
+                const reconciledRelayMetadata = await fetchRelayMetadataForRuntime({
+                  runtime: latestRuntime,
+                  fetch: (url, init) => fetch(url, init),
+                  preferSecureMetadata: attemptProfile === "uc-go-peer" && Boolean(latestRuntime.proxyUrl),
+                  attempts: 3,
+                  delayMs: 1e3,
+                  timeoutMs: 15e3
+                }).catch(() => null);
+                if (reconciledRelayMetadata) {
+                  const registrationId = createRelayBootstrapRegistrationId(
+                    attemptProfile,
+                    this.state.instanceName.trim(),
+                    attemptItemHash
+                  );
+                  const visibleRegistration = await waitForRelayBootstrapRegistration({
+                    registrationId,
+                    peerId: reconciledRelayMetadata.peerId,
+                    fetch: asJsonFetch,
+                    apiHost: this.client.apiHost,
+                    attempts: 3,
+                    delayMs: 1e3
+                  }).catch(() => null);
+                  if (visibleRegistration) {
+                    this.trace("deploy:recovered-after-error", {
+                      itemHash: attemptItemHash,
+                      registrationId,
+                      peerId: reconciledRelayMetadata.peerId,
+                      error: lastError.message
+                    });
+                    this.rememberRuntimeDetails(attemptItemHash, {
+                      messageStatus: "processed",
+                      allocationSource: latestRuntime.allocation?.source ?? null,
+                      crnUrl: latestRuntime.allocation?.crnUrl ?? latestRuntime.execution?.crnUrl ?? null,
+                      hostIpv4: latestRuntime.hostIpv4 ?? null,
+                      ipv6: latestRuntime.ipv6 ?? null,
+                      vmIpv4: latestRuntime.execution?.networking?.ipv4_ip ?? null,
+                      webUrl: latestRuntime.webAccessUrl ?? latestRuntime.proxyUrl ?? latestRuntime.execution?.networking?.proxy_url ?? null,
+                      sshCommand: latestRuntime.sshCommand ?? null,
+                      mappedPorts: latestRuntime.execution != null ? mappedPorts(latestRuntime.execution) : runtimeMappedPorts(latestRuntime.mappedPorts),
+                      execution: latestRuntime.execution ?? null,
+                      error: null
+                    });
+                    this.patch({
+                      busy: { deploying: false }
+                    });
+                    await this.refresh();
+                    this.lastCompletedDeploymentHash = attemptItemHash;
+                    this.emitProgress({
+                      stage: "completed",
+                      label: "Relay ready",
+                      progress: 100,
+                      status: "success",
+                      itemHash: attemptItemHash,
+                      detail: "The relay completed startup after a transient UI polling error. Runtime and bootstrap registration are confirmed."
+                    });
+                    return;
+                  }
+                }
+              }
+            } catch (reconcileError) {
+              this.trace("deploy:recovery-check-error", {
+                itemHash: attemptItemHash,
+                error: reconcileError instanceof Error ? reconcileError.message : String(reconcileError)
+              });
+            }
+            await this.refresh().catch(() => void 0);
+            const recoveredRegistration = this.state.bootstrapRegistrations.some(
+              (entry) => entry.instanceItemHash === attemptItemHash && entry.confirmed
+            );
+            if (recoveredRegistration) {
+              this.trace("deploy:recovered-from-refresh-state", {
+                itemHash: attemptItemHash,
+                error: lastError.message
+              });
+              this.patch({
+                busy: { deploying: false }
+              });
+              this.lastCompletedDeploymentHash = attemptItemHash;
+              this.emitProgress({
+                stage: "completed",
+                label: "Relay ready",
+                progress: 100,
+                status: "success",
+                itemHash: attemptItemHash,
+                detail: "The relay completed startup after a transient browser-side polling error. Runtime and bootstrap registration are confirmed."
+              });
+              return;
+            }
+          }
           if (attemptItemHash) {
             this.emitProgress({
               stage: "deployment-confirmed",

package/svelte/SponsorRelayFab.svelte

@@ -193,7 +193,7 @@ export let apiHost = undefined
 
     <div class="actions">
       {#if state.wallet.connected}
-        <button class="primary" type="button" on:click={() => controller.deploy()} disabled={state.busy.deploying || !state.rootfsVerified}>
+        <button class="primary" type="button" on:click={() => controller.deploy()} disabled={state.busy.deploying || state.rootfsHealth.tone !== 'ok'}>
           {state.busy.deploying ? 'Deploying…' : 'Deploy Relay'}
         </button>
       {:else}