@le-space/ui 0.6.36 → 0.6.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/ui",
-  "version": "0.6.36",
+  "version": "0.6.38",
   "description": "Floating Aleph Relay Button UI components for Svelte and React.",
   "license": "MIT",
   "type": "module",
@@ -44,8 +44,8 @@
     "url": "https://github.com/NiKrause/relay-button/issues"
   },
   "dependencies": {
-    "@le-space/browser": "0.6.36",
-    "@le-space/core": "0.6.36",
+    "@le-space/browser": "0.6.38",
+    "@le-space/core": "0.6.38",
     "viem": "^2.53.1"
   },
   "peerDependencies": {

package/react/index.d.ts

@@ -147,6 +147,15 @@ interface RootfsManifest {
     version: string;
     rootfsInstallStrategy?: 'thin' | 'prebaked' | string;
     requiresBootstrapNetwork?: boolean;
+    /**
+     * When true, the guest fetches its own bootstrap configuration from the
+     * Aleph aggregate (using the deployment token embedded in its SSH key)
+     * instead of the browser pushing it to the guest's plain-HTTP setup
+     * endpoint. Required to deploy from an HTTPS origin at all: a HTTPS page
+     * cannot call `http://<vm-ip>:<port>/configure` (mixed content).
+     * Images that predate the guest-side fetch must leave this unset.
+     */
+    supportsBootstrapConfigAggregate?: boolean;
     bootstrapSummary?: string;
     requiredPortForwards?: RootfsRequiredPortForward[];
     rootfsItemHash: string;

package/react/index.js

@@ -43,7 +43,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.6.36";
+var UI_PACKAGE_VERSION = "0.6.38";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -2343,7 +2343,6 @@ async function configureOrbitdbRelaySetup2(args) {
     quic_port: args.quicPort ?? void 0,
     bootstrap_publisher_private_key: args.bootstrapPublisherPrivateKey ?? void 0,
     bootstrap_publisher_libp2p_identity_hex: args.bootstrapPublisherLibp2pIdentityHex ?? void 0,
-    bootstrap_owner_private_key: args.bootstrapOwnerPrivateKey ?? void 0,
     bootstrap_owner_authorization_b64: args.bootstrapOwnerAuthorizationBase64 ?? void 0,
     bootstrap_registration_id: args.bootstrapRegistrationId ?? void 0,
     no_start: args.noStart === true ? true : void 0
@@ -3924,6 +3923,10 @@ function deploymentProfileForManifest(manifest) {
   if (manifest?.profile === "ucan-store") return "ucan-store";
   return null;
 }
+function usesBootstrapConfigAggregate(manifest) {
+  if (deploymentProfileForManifest(manifest) === "uc-go-peer") return true;
+  return manifest?.supportsBootstrapConfigAggregate === true;
+}
 function bootstrapRelayProfileForManifest(manifest) {
   const profile = deploymentProfileForManifest(manifest);
   if (profile === "uc-go-peer" || profile === "orbitdb-relay") {
@@ -4348,7 +4351,12 @@ var SponsorRelayController = class {
       );
     }
     let bootstrapSignalRelayMetadata = null;
-    if (profile === "orbitdb-relay") {
+    if (profile === "orbitdb-relay" && !usesBootstrapConfigAggregate(this.state.manifest)) {
+      if (globalThis.location?.protocol === "https:") {
+        throw new Error(
+          `This rootfs image requires the browser to configure the guest over plain HTTP (http://${runtimeHostIpv4}:${setupPort}/configure), which a page served over HTTPS cannot do (mixed content). Deploy from an HTTP origin, or use a rootfs image that supports the Aleph bootstrap config handoff (manifest: supportsBootstrapConfigAggregate).`
+        );
+      }
       this.emitProgress({
         stage: "deployment-confirmed",
         label: "Configuring relay",
@@ -4537,7 +4545,13 @@ var SponsorRelayController = class {
         instanceItemHash: args.itemHash,
         fetch: asJsonFetch,
         apiHost: this.client.apiHost,
-        attempts: 40,
+        // The guest publishes this signal only after its describe step has a
+        // browser-dialable address, which waits on AutoTLS for up to ~240 s.
+        // Wait comfortably longer than that (100 × 3 s = 300 s) so the complete
+        // signal arrives instead of timing out — a timeout here drops into the
+        // recovery path, which used to poll the guest over plain HTTP (mixed
+        // content on an HTTPS origin).
+        attempts: 100,
         delayMs: 3e3
       });
       this.trace("deploy:bootstrap-config-signal-visible", {
@@ -4589,6 +4603,12 @@ var SponsorRelayController = class {
         browserBootstrapMultiaddrCount: relayMetadata.browserBootstrapMultiaddrs.length
       });
     } else {
+      const canReadMetadataSecurely = profile === "uc-go-peer" && Boolean(runtime.proxyUrl);
+      if (usesBootstrapConfigAggregate(this.state.manifest) && !canReadMetadataSecurely) {
+        throw new Error(
+          "The relay applied its bootstrap config but the acknowledgement did not carry its final multiaddrs, and this image exposes no HTTPS metadata endpoint. Reading them over plain HTTP would be blocked as mixed content on an HTTPS origin, so the deployment cannot be completed."
+        );
+      }
       this.emitProgress({
         stage: "publishing-bootstrap",
         label: "Waiting for secure relay metadata",
@@ -4600,7 +4620,7 @@ var SponsorRelayController = class {
       relayMetadata = await fetchRelayMetadataForRuntime({
         runtime,
         fetch: (url, init) => fetch(url, init),
-        preferSecureMetadata: profile === "uc-go-peer" && Boolean(runtime.proxyUrl),
+        preferSecureMetadata: canReadMetadataSecurely,
         attempts: 80,
         delayMs: 3e3,
         timeoutMs: 24e4,
@@ -5449,7 +5469,7 @@ var SponsorRelayController = class {
         try {
           const profile = deploymentProfileForManifest(this.state.manifest);
           attemptProfile = profile;
-          const sshPublicKey = profile === "uc-go-peer" ? appendDeploymentTokenToSshPublicKey(
+          const sshPublicKey = usesBootstrapConfigAggregate(this.state.manifest) ? appendDeploymentTokenToSshPublicKey(
             this.state.sshPublicKey.trim(),
             this.state.wallet.address,
             attemptDeploymentToken = createDeploymentToken()
@@ -5702,11 +5722,13 @@ var SponsorRelayController = class {
                 crnListUrl: this.props.crnListUrl,
                 requirePublicGuestIpv6ForProxy: true
               });
-              if (latestRuntime.diagnostics?.state === "ready") {
+              const canReconcileMetadataSecurely = attemptProfile === "uc-go-peer" && Boolean(latestRuntime.proxyUrl);
+              const mayReadMetadata = canReconcileMetadataSecurely || !usesBootstrapConfigAggregate(this.state.manifest);
+              if (latestRuntime.diagnostics?.state === "ready" && mayReadMetadata) {
                 const reconciledRelayMetadata = await fetchRelayMetadataForRuntime({
                   runtime: latestRuntime,
                   fetch: (url, init) => fetch(url, init),
-                  preferSecureMetadata: attemptProfile === "uc-go-peer" && Boolean(latestRuntime.proxyUrl),
+                  preferSecureMetadata: canReconcileMetadataSecurely,
                   attempts: 3,
                   delayMs: 1e3,
                   timeoutMs: 15e3

package/shared/index.d.ts

@@ -145,6 +145,15 @@ interface RootfsManifest {
     version: string;
     rootfsInstallStrategy?: 'thin' | 'prebaked' | string;
     requiresBootstrapNetwork?: boolean;
+    /**
+     * When true, the guest fetches its own bootstrap configuration from the
+     * Aleph aggregate (using the deployment token embedded in its SSH key)
+     * instead of the browser pushing it to the guest's plain-HTTP setup
+     * endpoint. Required to deploy from an HTTPS origin at all: a HTTPS page
+     * cannot call `http://<vm-ip>:<port>/configure` (mixed content).
+     * Images that predate the guest-side fetch must leave this unset.
+     */
+    supportsBootstrapConfigAggregate?: boolean;
     bootstrapSummary?: string;
     requiredPortForwards?: RootfsRequiredPortForward$1[];
     rootfsItemHash: string;
@@ -332,7 +341,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.6.36";
+declare const UI_PACKAGE_VERSION = "0.6.38";
 
 interface RootfsRequiredPortForward {
     port: number;

package/shared/index.js

@@ -42,7 +42,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.6.36";
+var UI_PACKAGE_VERSION = "0.6.38";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -2342,7 +2342,6 @@ async function configureOrbitdbRelaySetup2(args) {
     quic_port: args.quicPort ?? void 0,
     bootstrap_publisher_private_key: args.bootstrapPublisherPrivateKey ?? void 0,
     bootstrap_publisher_libp2p_identity_hex: args.bootstrapPublisherLibp2pIdentityHex ?? void 0,
-    bootstrap_owner_private_key: args.bootstrapOwnerPrivateKey ?? void 0,
     bootstrap_owner_authorization_b64: args.bootstrapOwnerAuthorizationBase64 ?? void 0,
     bootstrap_registration_id: args.bootstrapRegistrationId ?? void 0,
     no_start: args.noStart === true ? true : void 0
@@ -3923,6 +3922,10 @@ function deploymentProfileForManifest(manifest) {
   if (manifest?.profile === "ucan-store") return "ucan-store";
   return null;
 }
+function usesBootstrapConfigAggregate(manifest) {
+  if (deploymentProfileForManifest(manifest) === "uc-go-peer") return true;
+  return manifest?.supportsBootstrapConfigAggregate === true;
+}
 function bootstrapRelayProfileForManifest(manifest) {
   const profile = deploymentProfileForManifest(manifest);
   if (profile === "uc-go-peer" || profile === "orbitdb-relay") {
@@ -4347,7 +4350,12 @@ var SponsorRelayController = class {
       );
     }
     let bootstrapSignalRelayMetadata = null;
-    if (profile === "orbitdb-relay") {
+    if (profile === "orbitdb-relay" && !usesBootstrapConfigAggregate(this.state.manifest)) {
+      if (globalThis.location?.protocol === "https:") {
+        throw new Error(
+          `This rootfs image requires the browser to configure the guest over plain HTTP (http://${runtimeHostIpv4}:${setupPort}/configure), which a page served over HTTPS cannot do (mixed content). Deploy from an HTTP origin, or use a rootfs image that supports the Aleph bootstrap config handoff (manifest: supportsBootstrapConfigAggregate).`
+        );
+      }
       this.emitProgress({
         stage: "deployment-confirmed",
         label: "Configuring relay",
@@ -4536,7 +4544,13 @@ var SponsorRelayController = class {
         instanceItemHash: args.itemHash,
         fetch: asJsonFetch,
         apiHost: this.client.apiHost,
-        attempts: 40,
+        // The guest publishes this signal only after its describe step has a
+        // browser-dialable address, which waits on AutoTLS for up to ~240 s.
+        // Wait comfortably longer than that (100 × 3 s = 300 s) so the complete
+        // signal arrives instead of timing out — a timeout here drops into the
+        // recovery path, which used to poll the guest over plain HTTP (mixed
+        // content on an HTTPS origin).
+        attempts: 100,
         delayMs: 3e3
       });
       this.trace("deploy:bootstrap-config-signal-visible", {
@@ -4588,6 +4602,12 @@ var SponsorRelayController = class {
         browserBootstrapMultiaddrCount: relayMetadata.browserBootstrapMultiaddrs.length
       });
     } else {
+      const canReadMetadataSecurely = profile === "uc-go-peer" && Boolean(runtime.proxyUrl);
+      if (usesBootstrapConfigAggregate(this.state.manifest) && !canReadMetadataSecurely) {
+        throw new Error(
+          "The relay applied its bootstrap config but the acknowledgement did not carry its final multiaddrs, and this image exposes no HTTPS metadata endpoint. Reading them over plain HTTP would be blocked as mixed content on an HTTPS origin, so the deployment cannot be completed."
+        );
+      }
       this.emitProgress({
         stage: "publishing-bootstrap",
         label: "Waiting for secure relay metadata",
@@ -4599,7 +4619,7 @@ var SponsorRelayController = class {
       relayMetadata = await fetchRelayMetadataForRuntime({
         runtime,
         fetch: (url, init) => fetch(url, init),
-        preferSecureMetadata: profile === "uc-go-peer" && Boolean(runtime.proxyUrl),
+        preferSecureMetadata: canReadMetadataSecurely,
         attempts: 80,
         delayMs: 3e3,
         timeoutMs: 24e4,
@@ -5448,7 +5468,7 @@ var SponsorRelayController = class {
         try {
           const profile = deploymentProfileForManifest(this.state.manifest);
           attemptProfile = profile;
-          const sshPublicKey = profile === "uc-go-peer" ? appendDeploymentTokenToSshPublicKey(
+          const sshPublicKey = usesBootstrapConfigAggregate(this.state.manifest) ? appendDeploymentTokenToSshPublicKey(
             this.state.sshPublicKey.trim(),
             this.state.wallet.address,
             attemptDeploymentToken = createDeploymentToken()
@@ -5701,11 +5721,13 @@ var SponsorRelayController = class {
                 crnListUrl: this.props.crnListUrl,
                 requirePublicGuestIpv6ForProxy: true
               });
-              if (latestRuntime.diagnostics?.state === "ready") {
+              const canReconcileMetadataSecurely = attemptProfile === "uc-go-peer" && Boolean(latestRuntime.proxyUrl);
+              const mayReadMetadata = canReconcileMetadataSecurely || !usesBootstrapConfigAggregate(this.state.manifest);
+              if (latestRuntime.diagnostics?.state === "ready" && mayReadMetadata) {
                 const reconciledRelayMetadata = await fetchRelayMetadataForRuntime({
                   runtime: latestRuntime,
                   fetch: (url, init) => fetch(url, init),
-                  preferSecureMetadata: attemptProfile === "uc-go-peer" && Boolean(latestRuntime.proxyUrl),
+                  preferSecureMetadata: canReconcileMetadataSecurely,
                   attempts: 3,
                   delayMs: 1e3,
                   timeoutMs: 15e3