@le-space/ui 0.6.5 → 0.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/ui",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "Floating Aleph sponsor relay 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.5",
-    "@le-space/core": "0.6.5",
+    "@le-space/browser": "0.6.6",
+    "@le-space/core": "0.6.6",
     "viem": "^2.53.1"
   },
   "peerDependencies": {

package/react/index.d.ts

@@ -211,6 +211,7 @@ interface SponsorRelayProps {
     launcherMode?: 'floating' | 'inline';
     version?: string;
     apiHost?: string;
+    apiHosts?: string | readonly string[];
     crnListUrl?: string;
     schedulerApiHost?: string;
     twoN6ApiHost?: 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.5";
+var UI_PACKAGE_VERSION = "0.6.6";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -135,7 +135,12 @@ async function fetchWithTimeout(input, init = {}, timeoutMs = 15e3) {
 }
 
 // ../browser/src/aleph-api.ts
-var DEFAULT_ALEPH_API_HOST = "https://api.aleph.im";
+var DEFAULT_ALEPH_API_HOSTS = [
+  "https://api3.aleph.im",
+  "https://api2.aleph.im",
+  "https://api.aleph.im"
+];
+var DEFAULT_ALEPH_API_HOST = DEFAULT_ALEPH_API_HOSTS[0] ?? "https://api3.aleph.im";
 var DEFAULT_CRN_LIST_URL = "https://crns-list.aleph.sh/crns.json";
 var DEFAULT_ALEPH_SCHEDULER_API_HOST = "https://scheduler.api.aleph.cloud";
 var DEFAULT_2N6_API_HOST = "https://api.2n6.me";
@@ -805,29 +810,56 @@ function watchWallet(onChange, provider = getEthereumProvider()) {
 }
 
 // ../browser/src/client.ts
+function normalizeApiHost(value) {
+  const trimmed = value.trim().replace(/\/+$/u, "");
+  return trimmed ? trimmed : null;
+}
+function normalizeApiHosts(input, fallbackApiHost) {
+  const rawValues = Array.isArray(input) ? input : typeof input === "string" ? input.split(/[\s,]+/u) : [];
+  const hosts = rawValues.map((value) => normalizeApiHost(String(value))).filter((value) => Boolean(value));
+  if (hosts.length > 0) return Array.from(new Set(hosts));
+  const fallback = normalizeApiHost(fallbackApiHost);
+  return fallback ? [fallback] : [...DEFAULT_ALEPH_API_HOSTS];
+}
+async function withApiHostFallback(apiHosts, run) {
+  let lastError = null;
+  for (let index = 0; index < apiHosts.length; index += 1) {
+    const apiHost = apiHosts[index];
+    try {
+      return await run(apiHost);
+    } catch (error) {
+      lastError = error;
+      if (index >= apiHosts.length - 1) break;
+    }
+  }
+  if (lastError instanceof Error) throw lastError;
+  throw new Error(String(lastError));
+}
 function createAlephBrowserClient(options = {}) {
-  const apiHost = options.apiHost ?? DEFAULT_ALEPH_API_HOST;
+  const apiHosts = options.apiHosts === void 0 && options.apiHost === void 0 ? [...DEFAULT_ALEPH_API_HOSTS] : normalizeApiHosts(options.apiHosts, options.apiHost ?? DEFAULT_ALEPH_API_HOST);
+  const apiHost = apiHosts[0] ?? DEFAULT_ALEPH_API_HOST;
   const crnListUrl = options.crnListUrl ?? DEFAULT_CRN_LIST_URL;
   const schedulerApiHost = options.schedulerApiHost ?? DEFAULT_ALEPH_SCHEDULER_API_HOST;
   const twoN6ApiHost = options.twoN6ApiHost ?? DEFAULT_2N6_API_HOST;
   return {
     apiHost,
+    apiHosts,
     crnListUrl,
     schedulerApiHost,
     fetchBalance(address) {
-      return fetchBalance(address, apiHost);
+      return withApiHostFallback(apiHosts, (host) => fetchBalance(address, host));
     },
     fetchCrns() {
       return fetchCrns(crnListUrl);
     },
     fetchInstances(address) {
-      return fetchInstances(address, apiHost);
+      return withApiHostFallback(apiHosts, (host) => fetchInstances(address, host));
     },
     fetch2n6WebAccessUrl(itemHash) {
       return fetch2n6WebAccessUrl(itemHash, twoN6ApiHost);
     },
     fetchMessageEnvelope(itemHash) {
-      return fetchMessageEnvelope(itemHash, apiHost);
+      return withApiHostFallback(apiHosts, (host) => fetchMessageEnvelope(itemHash, host));
     },
     fetchSchedulerAllocation(itemHash) {
       return fetchSchedulerAllocation(itemHash, schedulerApiHost);
@@ -842,16 +874,16 @@ function createAlephBrowserClient(options = {}) {
       return configureOrbitdbRelaySetup(args);
     },
     inspectDeploymentResult(itemHash, rootfsRef) {
-      return inspectDeploymentResult(itemHash, rootfsRef, apiHost);
+      return withApiHostFallback(apiHosts, (host) => inspectDeploymentResult(itemHash, rootfsRef, host));
     },
     waitForDeploymentResult(itemHash, rootfsRef, attempts, delayMs) {
-      return waitForDeploymentResult(itemHash, rootfsRef, apiHost, attempts, delayMs);
+      return withApiHostFallback(apiHosts, (host) => waitForDeploymentResult(itemHash, rootfsRef, host, attempts, delayMs));
     },
     broadcastInstanceMessage(message, sync) {
-      return broadcastInstanceMessage(message, apiHost, sync);
+      return withApiHostFallback(apiHosts, (host) => broadcastInstanceMessage(message, host, sync));
     },
     broadcastAlephMessage(message, sync) {
-      return broadcastAlephMessage(message, apiHost, sync);
+      return withApiHostFallback(apiHosts, (host) => broadcastAlephMessage(message, host, sync));
     }
   };
 }
@@ -2487,15 +2519,35 @@ function browserMultiaddrPreference(addr) {
   if (normalized.includes("/ws")) return 4;
   return 5;
 }
+function browserMultiaddrTransport(addr) {
+  const normalized = addr.toLowerCase();
+  if (normalized.includes("/webtransport/")) return "webtransport";
+  if (normalized.includes("/webrtc-direct/")) return "webrtc";
+  if (normalized.includes("/ws") || normalized.includes("/wss")) return "websocket";
+  return "other";
+}
 function selectCompactRelayBootstrapMultiaddrs(addrs, limit = DEFAULT_BOOTSTRAP_COMPACT_MULTIADDR_LIMIT) {
   const entries = filterPublicMultiaddrs(addrs, {
     browserDialableOnly: true
-  }).map((addr, index) => ({ addr, index }));
+  }).map((addr, index) => ({
+    addr,
+    index,
+    transport: browserMultiaddrTransport(addr)
+  }));
   entries.sort((left, right) => {
     const preference = browserMultiaddrPreference(left.addr) - browserMultiaddrPreference(right.addr);
     return preference !== 0 ? preference : left.index - right.index;
   });
-  return entries.map((entry) => entry.addr).slice(0, Math.max(1, Math.floor(limit)));
+  const perTransportLimit = Math.max(1, Math.floor(limit));
+  const selectedByTransport = /* @__PURE__ */ new Map();
+  const result = [];
+  for (const entry of entries) {
+    const selected = selectedByTransport.get(entry.transport) ?? 0;
+    if (selected >= perTransportLimit) continue;
+    selectedByTransport.set(entry.transport, selected + 1);
+    result.push(entry.addr);
+  }
+  return result;
 }
 function asTrimmedString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
@@ -4042,6 +4094,7 @@ var SponsorRelayController = class {
     this.debugEnabled = isDebugEnabled(props);
     this.client = createAlephBrowserClient({
       apiHost: props.apiHost,
+      apiHosts: props.apiHosts,
       crnListUrl: props.crnListUrl,
       schedulerApiHost: props.schedulerApiHost,
       twoN6ApiHost: props.twoN6ApiHost
@@ -5982,6 +6035,7 @@ function useSponsorRelayController(props) {
     () => createSponsorRelayController(props),
     [
       props.apiHost,
+      props.apiHosts,
       props.crnListUrl,
       props.debug,
       props.instanceName,

package/shared/index.d.ts

@@ -209,6 +209,7 @@ interface SponsorRelayProps {
     launcherMode?: 'floating' | 'inline';
     version?: string;
     apiHost?: string;
+    apiHosts?: string | readonly string[];
     crnListUrl?: string;
     schedulerApiHost?: string;
     twoN6ApiHost?: string;
@@ -330,7 +331,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.5";
+declare const UI_PACKAGE_VERSION = "0.6.6";
 
 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.5";
+var UI_PACKAGE_VERSION = "0.6.6";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -134,7 +134,12 @@ async function fetchWithTimeout(input, init = {}, timeoutMs = 15e3) {
 }
 
 // ../browser/src/aleph-api.ts
-var DEFAULT_ALEPH_API_HOST = "https://api.aleph.im";
+var DEFAULT_ALEPH_API_HOSTS = [
+  "https://api3.aleph.im",
+  "https://api2.aleph.im",
+  "https://api.aleph.im"
+];
+var DEFAULT_ALEPH_API_HOST = DEFAULT_ALEPH_API_HOSTS[0] ?? "https://api3.aleph.im";
 var DEFAULT_CRN_LIST_URL = "https://crns-list.aleph.sh/crns.json";
 var DEFAULT_ALEPH_SCHEDULER_API_HOST = "https://scheduler.api.aleph.cloud";
 var DEFAULT_2N6_API_HOST = "https://api.2n6.me";
@@ -804,29 +809,56 @@ function watchWallet(onChange, provider = getEthereumProvider()) {
 }
 
 // ../browser/src/client.ts
+function normalizeApiHost(value) {
+  const trimmed = value.trim().replace(/\/+$/u, "");
+  return trimmed ? trimmed : null;
+}
+function normalizeApiHosts(input, fallbackApiHost) {
+  const rawValues = Array.isArray(input) ? input : typeof input === "string" ? input.split(/[\s,]+/u) : [];
+  const hosts = rawValues.map((value) => normalizeApiHost(String(value))).filter((value) => Boolean(value));
+  if (hosts.length > 0) return Array.from(new Set(hosts));
+  const fallback = normalizeApiHost(fallbackApiHost);
+  return fallback ? [fallback] : [...DEFAULT_ALEPH_API_HOSTS];
+}
+async function withApiHostFallback(apiHosts, run) {
+  let lastError = null;
+  for (let index = 0; index < apiHosts.length; index += 1) {
+    const apiHost = apiHosts[index];
+    try {
+      return await run(apiHost);
+    } catch (error) {
+      lastError = error;
+      if (index >= apiHosts.length - 1) break;
+    }
+  }
+  if (lastError instanceof Error) throw lastError;
+  throw new Error(String(lastError));
+}
 function createAlephBrowserClient(options = {}) {
-  const apiHost = options.apiHost ?? DEFAULT_ALEPH_API_HOST;
+  const apiHosts = options.apiHosts === void 0 && options.apiHost === void 0 ? [...DEFAULT_ALEPH_API_HOSTS] : normalizeApiHosts(options.apiHosts, options.apiHost ?? DEFAULT_ALEPH_API_HOST);
+  const apiHost = apiHosts[0] ?? DEFAULT_ALEPH_API_HOST;
   const crnListUrl = options.crnListUrl ?? DEFAULT_CRN_LIST_URL;
   const schedulerApiHost = options.schedulerApiHost ?? DEFAULT_ALEPH_SCHEDULER_API_HOST;
   const twoN6ApiHost = options.twoN6ApiHost ?? DEFAULT_2N6_API_HOST;
   return {
     apiHost,
+    apiHosts,
     crnListUrl,
     schedulerApiHost,
     fetchBalance(address) {
-      return fetchBalance(address, apiHost);
+      return withApiHostFallback(apiHosts, (host) => fetchBalance(address, host));
     },
     fetchCrns() {
       return fetchCrns(crnListUrl);
     },
     fetchInstances(address) {
-      return fetchInstances(address, apiHost);
+      return withApiHostFallback(apiHosts, (host) => fetchInstances(address, host));
     },
     fetch2n6WebAccessUrl(itemHash) {
       return fetch2n6WebAccessUrl(itemHash, twoN6ApiHost);
     },
     fetchMessageEnvelope(itemHash) {
-      return fetchMessageEnvelope(itemHash, apiHost);
+      return withApiHostFallback(apiHosts, (host) => fetchMessageEnvelope(itemHash, host));
     },
     fetchSchedulerAllocation(itemHash) {
       return fetchSchedulerAllocation(itemHash, schedulerApiHost);
@@ -841,16 +873,16 @@ function createAlephBrowserClient(options = {}) {
       return configureOrbitdbRelaySetup(args);
     },
     inspectDeploymentResult(itemHash, rootfsRef) {
-      return inspectDeploymentResult(itemHash, rootfsRef, apiHost);
+      return withApiHostFallback(apiHosts, (host) => inspectDeploymentResult(itemHash, rootfsRef, host));
     },
     waitForDeploymentResult(itemHash, rootfsRef, attempts, delayMs) {
-      return waitForDeploymentResult(itemHash, rootfsRef, apiHost, attempts, delayMs);
+      return withApiHostFallback(apiHosts, (host) => waitForDeploymentResult(itemHash, rootfsRef, host, attempts, delayMs));
     },
     broadcastInstanceMessage(message, sync) {
-      return broadcastInstanceMessage(message, apiHost, sync);
+      return withApiHostFallback(apiHosts, (host) => broadcastInstanceMessage(message, host, sync));
     },
     broadcastAlephMessage(message, sync) {
-      return broadcastAlephMessage(message, apiHost, sync);
+      return withApiHostFallback(apiHosts, (host) => broadcastAlephMessage(message, host, sync));
     }
   };
 }
@@ -2486,15 +2518,35 @@ function browserMultiaddrPreference(addr) {
   if (normalized.includes("/ws")) return 4;
   return 5;
 }
+function browserMultiaddrTransport(addr) {
+  const normalized = addr.toLowerCase();
+  if (normalized.includes("/webtransport/")) return "webtransport";
+  if (normalized.includes("/webrtc-direct/")) return "webrtc";
+  if (normalized.includes("/ws") || normalized.includes("/wss")) return "websocket";
+  return "other";
+}
 function selectCompactRelayBootstrapMultiaddrs(addrs, limit = DEFAULT_BOOTSTRAP_COMPACT_MULTIADDR_LIMIT) {
   const entries = filterPublicMultiaddrs(addrs, {
     browserDialableOnly: true
-  }).map((addr, index) => ({ addr, index }));
+  }).map((addr, index) => ({
+    addr,
+    index,
+    transport: browserMultiaddrTransport(addr)
+  }));
   entries.sort((left, right) => {
     const preference = browserMultiaddrPreference(left.addr) - browserMultiaddrPreference(right.addr);
     return preference !== 0 ? preference : left.index - right.index;
   });
-  return entries.map((entry) => entry.addr).slice(0, Math.max(1, Math.floor(limit)));
+  const perTransportLimit = Math.max(1, Math.floor(limit));
+  const selectedByTransport = /* @__PURE__ */ new Map();
+  const result = [];
+  for (const entry of entries) {
+    const selected = selectedByTransport.get(entry.transport) ?? 0;
+    if (selected >= perTransportLimit) continue;
+    selectedByTransport.set(entry.transport, selected + 1);
+    result.push(entry.addr);
+  }
+  return result;
 }
 function asTrimmedString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : null;
@@ -4041,6 +4093,7 @@ var SponsorRelayController = class {
     this.debugEnabled = isDebugEnabled(props);
     this.client = createAlephBrowserClient({
       apiHost: props.apiHost,
+      apiHosts: props.apiHosts,
       crnListUrl: props.crnListUrl,
       schedulerApiHost: props.schedulerApiHost,
       twoN6ApiHost: props.twoN6ApiHost

package/svelte/SponsorRelayFab.svelte

@@ -18,6 +18,7 @@ export let openByDefault = false
 export let launcherMode = 'floating'
 export let version = ''
 export let apiHost = undefined
+export let apiHosts = undefined
   export let crnListUrl = undefined
   export let schedulerApiHost = undefined
   export let twoN6ApiHost = undefined
@@ -32,6 +33,7 @@ export let apiHost = undefined
   openByDefault,
   launcherMode,
   apiHost,
+  apiHosts,
     crnListUrl,
     schedulerApiHost,
     twoN6ApiHost