@openzeppelin/ui-builder-adapter-stellar 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/ui-builder-adapter-stellar",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Stellar Adapter for UI Builder",
   "keywords": [
     "openzeppelin",

package/src/access-control/indexer-client.ts

@@ -20,10 +20,64 @@ import {
   IndexerUnavailable,
   OperationFailed,
 } from '@openzeppelin/ui-builder-types';
-import { appConfigService, logger } from '@openzeppelin/ui-builder-utils';
+import {
+  appConfigService,
+  isValidUrl,
+  logger,
+  userNetworkServiceConfigService,
+} from '@openzeppelin/ui-builder-utils';
 
 const LOG_SYSTEM = 'StellarIndexerClient';
 
+/**
+ * Extracts the user-configured indexer endpoints from UserNetworkServiceConfigService.
+ * Validates URLs before returning them to prevent invalid URLs from causing runtime errors.
+ *
+ * @param networkId - The network ID to get the indexer config for
+ * @returns The indexer endpoint config if configured and valid, undefined otherwise
+ */
+function getUserIndexerEndpoints(networkId: string): IndexerEndpointConfig | undefined {
+  const svcCfg = userNetworkServiceConfigService.get(networkId, 'indexer');
+  if (!svcCfg || typeof svcCfg !== 'object') {
+    return undefined;
+  }
+
+  const endpoints: IndexerEndpointConfig = {};
+
+  // Check for indexerUri field (HTTP endpoint) and validate
+  if ('indexerUri' in svcCfg && svcCfg.indexerUri) {
+    const httpUrl = String(svcCfg.indexerUri).trim();
+    if (httpUrl && isValidUrl(httpUrl)) {
+      endpoints.http = httpUrl;
+    } else if (httpUrl) {
+      logger.warn(
+        LOG_SYSTEM,
+        `User-configured indexer HTTP URL for ${networkId} is invalid: ${httpUrl}. Ignoring.`
+      );
+    }
+  }
+
+  // Check for indexerWsUri field (WebSocket endpoint) and validate
+  if ('indexerWsUri' in svcCfg && svcCfg.indexerWsUri) {
+    const wsUrl = String(svcCfg.indexerWsUri).trim();
+    if (wsUrl && isValidUrl(wsUrl)) {
+      endpoints.ws = wsUrl;
+    } else if (wsUrl) {
+      logger.warn(
+        LOG_SYSTEM,
+        `User-configured indexer WebSocket URL for ${networkId} is invalid: ${wsUrl}. Ignoring.`
+      );
+    }
+  }
+
+  // Return undefined if no valid endpoints were found
+  if (!endpoints.http && !endpoints.ws) {
+    return undefined;
+  }
+
+  return endpoints;
+}
+
 /**
  * GraphQL query response types for indexer
  */
@@ -162,9 +216,41 @@ export class StellarIndexerClient {
   private resolvedEndpoints: IndexerEndpointConfig | null = null;
   private availabilityChecked = false;
   private isAvailable = false;
+  private readonly unsubscribeFromConfigChanges: () => void;
 
   constructor(networkConfig: StellarNetworkConfig) {
     this.networkConfig = networkConfig;
+
+    // Subscribe to indexer config changes to reset cache when user updates settings
+    this.unsubscribeFromConfigChanges = userNetworkServiceConfigService.subscribe(
+      networkConfig.id,
+      'indexer',
+      () => {
+        logger.info(
+          LOG_SYSTEM,
+          `User indexer config changed for ${networkConfig.id}, resetting cache`
+        );
+        this.resetCache();
+      }
+    );
+  }
+
+  /**
+   * Resets the resolved endpoints and availability cache.
+   * Called when user configuration changes to force re-resolution.
+   */
+  private resetCache(): void {
+    this.resolvedEndpoints = null;
+    this.availabilityChecked = false;
+    this.isAvailable = false;
+  }
+
+  /**
+   * Cleans up subscriptions when the client is no longer needed.
+   * Call this method when disposing of the client to prevent memory leaks.
+   */
+  public dispose(): void {
+    this.unsubscribeFromConfigChanges();
   }
 
   /**
@@ -990,10 +1076,11 @@ export class StellarIndexerClient {
   /**
    * Resolve indexer endpoints with config precedence
    * Priority:
-   * 1. Runtime override from AppConfigService
-   * 2. Network config defaults (indexerUri/indexerWsUri)
-   * 3. Derived from RPC (if safe pattern exists)
-   * 4. None (returns empty object)
+   * 1. User-configured indexer from UserNetworkServiceConfigService (localStorage)
+   * 2. Runtime override from AppConfigService (environment/JSON config)
+   * 3. Network config defaults (indexerUri/indexerWsUri)
+   * 4. Derived from RPC (if safe pattern exists)
+   * 5. None (returns empty object)
    *
    * @returns Resolved indexer endpoints
    */
@@ -1005,7 +1092,26 @@ export class StellarIndexerClient {
     const networkId = this.networkConfig.id;
     const endpoints: IndexerEndpointConfig = {};
 
-    // Priority 1: Check AppConfigService for runtime override
+    // Priority 1: Check user-configured indexer from localStorage
+    const userIndexerConfig = getUserIndexerEndpoints(networkId);
+    if (userIndexerConfig) {
+      if (userIndexerConfig.http) {
+        endpoints.http = userIndexerConfig.http;
+      }
+      if (userIndexerConfig.ws) {
+        endpoints.ws = userIndexerConfig.ws;
+      }
+      if (endpoints.http || endpoints.ws) {
+        logger.info(
+          LOG_SYSTEM,
+          `Using user-configured indexer for ${networkId}: http=${endpoints.http}, ws=${endpoints.ws}`
+        );
+        this.resolvedEndpoints = endpoints;
+        return endpoints;
+      }
+    }
+
+    // Priority 2: Check AppConfigService for runtime override
     const indexerOverride = appConfigService.getIndexerEndpointOverride(networkId);
     if (indexerOverride) {
       if (typeof indexerOverride === 'string') {
@@ -1030,7 +1136,7 @@ export class StellarIndexerClient {
       return endpoints;
     }
 
-    // Priority 2: Network config defaults
+    // Priority 3: Network config defaults
     if (this.networkConfig.indexerUri) {
       endpoints.http = this.networkConfig.indexerUri;
       logger.info(
@@ -1051,7 +1157,7 @@ export class StellarIndexerClient {
       return endpoints;
     }
 
-    // Priority 3: Derive from RPC (only if safe, known pattern exists)
+    // Priority 4: Derive from RPC (only if safe, known pattern exists)
     // Currently DISABLED - no safe derivation pattern implemented
     // This would be enabled in the future when indexer/RPC relationship is well-defined
     logger.debug(LOG_SYSTEM, `No indexer derivation pattern available for ${networkId}`);
@@ -1075,6 +1181,7 @@ export class StellarIndexerClient {
       OWNERSHIP_TRANSFER_COMPLETED: 'OWNERSHIP_TRANSFER_COMPLETED',
       ADMIN_TRANSFER_INITIATED: 'ADMIN_TRANSFER_INITIATED',
       ADMIN_TRANSFER_COMPLETED: 'ADMIN_TRANSFER_COMPLETED',
+      UNKNOWN: 'UNKNOWN',
     };
     return mapping[changeType];
   }

package/src/access-control/service.ts

@@ -1318,6 +1318,22 @@ export class StellarAccessControlService implements AccessControlService {
       return [];
     }
   }
+
+  /**
+   * Disposes of the service and cleans up resources.
+   *
+   * Cleans up the indexer client's subscriptions to prevent memory leaks.
+   * Call this method when the service is no longer needed.
+   *
+   * Note: In typical usage where the service is application-scoped and lives
+   * for the duration of the application, calling dispose is not strictly necessary.
+   * However, it should be called if the service is created/destroyed dynamically
+   * (e.g., in tests or when switching networks).
+   */
+  dispose(): void {
+    this.indexerClient.dispose();
+    logger.debug('StellarAccessControlService.dispose', 'Service disposed');
+  }
 }
 
 /**

package/src/networks/testnet.ts

@@ -16,5 +16,5 @@ export const stellarTestnet: StellarNetworkConfig = {
   networkPassphrase: 'Test SDF Network ; September 2015',
   explorerUrl: 'https://stellar.expert/explorer/testnet',
   iconComponent: NetworkStellar,
-  // indexerUri and indexerWsUri will be added here when stable testnet indexer endpoints are available
+  indexerUri: 'https://openzepplin-stellar-testnet.graphql.subquery.network',
 };