resolve conflicts

Author: linglingye001

src/AzureAppConfigurationImpl.ts

@@ -15,6 +15,7 @@ import { RefreshTimer } from "./refresh/RefreshTimer";
 import { getConfigurationSettingWithTrace, listConfigurationSettingsWithTrace, requestTracingEnabled } from "./requestTracing/utils";
 import { KeyFilter, LabelFilter, SettingSelector } from "./types";
 import { ConfigurationClientManager } from "./ConfigurationClientManager";
+import { updateClientBackoffStatus } from "./ConfigurationClientWrapper";
 
 type PagedSettingSelector = SettingSelector & {
     /**
@@ -40,6 +41,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
     #client: AppConfigurationClient;
     #options: AzureAppConfigurationOptions | undefined;
     #isInitialLoadCompleted: boolean = false;
+    #isFailoverRequest: boolean = false;
 
     // Refresh
     #refreshInterval: number = DEFAULT_REFRESH_INTERVAL_IN_MS;
@@ -58,11 +60,11 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
     #featureFlagSelectors: PagedSettingSelector[] = [];
 
     constructor(
-        client: AppConfigurationClient,
-        options: AzureAppConfigurationOptions | undefined
+        clientManager: ConfigurationClientManager,
+        options: AzureAppConfigurationOptions | undefined, 
     ) {
-        this.#client = client;
         this.#options = options;
+        this.#clientManager = clientManager;
 
         // Enable request tracing if not opt-out
         this.#requestTracingEnabled = requestTracingEnabled();
@@ -175,34 +177,70 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         return {
             requestTracingEnabled: this.#requestTracingEnabled,
             initialLoadCompleted: this.#isInitialLoadCompleted,
-            appConfigOptions: this.#options
+            appConfigOptions: this.#options,
+            isFailoverRequest: this.#isFailoverRequest
         };
     }
 
-    async #loadSelectedKeyValues(): Promise<ConfigurationSetting[]> {
-        const loadedSettings: ConfigurationSetting[] = [];
+    async #executeWithFailoverPolicy(funcToExecute) {
+        const clients = await this.#clientManager.getClients();
+        if (clients.length === 0) {
+            this.#clientManager.refreshClients();
+            throw new Error("No client is available to connect to the target App Configuration store.");
+        }
 
-        // validate selectors
-        const selectors = getValidKeyValueSelectors(this.#options?.selectors);
+        for (const client of clients) {
+            let successful = false;
+            try {
+                const result = await funcToExecute(client.client);
+                this.#isFailoverRequest = false;
+                successful = true;
+                updateClientBackoffStatus(client, successful);
+                return result;
+            } catch (error) {
+                if (isFailoverableError(error)) {
+                    updateClientBackoffStatus(client, successful);
+                    this.#isFailoverRequest = true;
+                    continue;
+                }
 
-        for (const selector of selectors) {
-            const listOptions: ListConfigurationSettingsOptions = {
-                keyFilter: selector.keyFilter,
-                labelFilter: selector.labelFilter
-            };
+                throw error;
+            }
+        }
 
-            const settings = listConfigurationSettingsWithTrace(
-                this.#requestTraceOptions,
-                this.#client,
-                listOptions
-            );
+        this.#clientManager.refreshClients();
+        throw new Error("All app configuration clients failed to get settings.");
+    }
 
-            for await (const setting of settings) {
-                if (!isFeatureFlag(setting)) { // exclude feature flags
-                    loadedSettings.push(setting);
+    async #loadSelectedKeyValues(): Promise<ConfigurationSetting[]> {
+        // validate selectors
+        const selectors = getValidKeyValueSelectors(this.#options?.selectors);
+        let loadedSettings: ConfigurationSetting[] = [];
+
+        const funcToExecute = async (client) => {
+            const loadedSettings: ConfigurationSetting[] = [];
+            for (const selector of selectors) {
+                const listOptions: ListConfigurationSettingsOptions = {
+                    keyFilter: selector.keyFilter,
+                    labelFilter: selector.labelFilter
+                };
+
+                const settings = listConfigurationSettingsWithTrace(
+                    this.#requestTraceOptions,
+                    client,
+                    listOptions
+                );
+
+                for await (const setting of settings) {
+                    if (!isFeatureFlag(setting)) { // exclude feature flags
+                        loadedSettings.push(setting);
+                    }
                 }
             }
-        }
+            return loadedSettings;
+        };
+
+        loadedSettings = await this.#executeWithFailoverPolicy(funcToExecute);
         return loadedSettings;
     }
 
@@ -258,30 +296,42 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
 
     async #loadFeatureFlags() {
         // Temporary map to store feature flags, key is the key of the setting, value is the raw value of the setting
-        const featureFlagsMap = new Map<string, any>();
-        for (const selector of this.#featureFlagSelectors) {
-            const listOptions: ListConfigurationSettingsOptions = {
-                keyFilter: `${featureFlagPrefix}${selector.keyFilter}`,
-                labelFilter: selector.labelFilter
-            };
-
-            const pageEtags: string[] = [];
-            const pageIterator = listConfigurationSettingsWithTrace(
-                this.#requestTraceOptions,
-                this.#client,
-                listOptions
-            ).byPage();
-            for await (const page of pageIterator) {
-                pageEtags.push(page.etag ?? "");
-                for (const setting of page.items) {
-                    if (isFeatureFlag(setting)) {
-                        featureFlagsMap.set(setting.key, setting.value);
+        const funcToExecute = async (client) => {
+            const featureFlagsMap = new Map<string, any>();
+            const selectors = JSON.parse(
+                JSON.stringify(this.#featureFlagSelectors)
+            );
+
+            for (const selector of selectors) {
+                const listOptions: ListConfigurationSettingsOptions = {
+                    keyFilter: `${featureFlagPrefix}${selector.keyFilter}`,
+                    labelFilter: selector.labelFilter
+                };
+
+                const pageEtags: string[] = [];
+                const pageIterator = listConfigurationSettingsWithTrace(
+                    this.#requestTraceOptions,
+                    client,
+                    listOptions
+                ).byPage();
+                for await (const page of pageIterator) {
+                    pageEtags.push(page.etag ?? "");
+                    for (const setting of page.items) {
+                        if (isFeatureFlag(setting)) {
+                            featureFlagsMap.set(setting.key, setting.value);
+                        }
                     }
                 }
+                selector.pageEtags = pageEtags;        
             }
-            selector.pageEtags = pageEtags;
+
+            this.#featureFlagSelectors = selectors;
+            return featureFlagsMap;
         }
 
+        let featureFlagsMap = new Map<string, any>();
+        featureFlagsMap = await this.#executeWithFailoverPolicy(funcToExecute);
+
         // parse feature flags
         const featureFlags = Array.from(featureFlagsMap.values()).map(rawFlag => JSON.parse(rawFlag));
 
@@ -431,30 +481,32 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         }
 
         // check if any feature flag is changed
-        let needRefresh = false;
-        for (const selector of this.#featureFlagSelectors) {
-            const listOptions: ListConfigurationSettingsOptions = {
-                keyFilter: `${featureFlagPrefix}${selector.keyFilter}`,
-                labelFilter: selector.labelFilter,
-                pageEtags: selector.pageEtags
-            };
-            const pageIterator = listConfigurationSettingsWithTrace(
-                this.#requestTraceOptions,
-                this.#client,
-                listOptions
-            ).byPage();
-
-            for await (const page of pageIterator) {
-                if (page._response.status === 200) { // created or changed
-                    needRefresh = true;
-                    break;
+        const funcToExecute = async (client) => {
+            const needRefresh = false;
+            for (const selector of this.#featureFlagSelectors) {
+                const listOptions: ListConfigurationSettingsOptions = {
+                    keyFilter: `${featureFlagPrefix}${selector.keyFilter}`,
+                    labelFilter: selector.labelFilter,
+                    pageEtags: selector.pageEtags
+                };
+
+                const pageIterator = listConfigurationSettingsWithTrace(
+                    this.#requestTraceOptions,
+                    client,
+                    listOptions
+                ).byPage();
+
+                for await (const page of pageIterator) {
+                    if (page._response.status === 200) { // created or changed
+                        return true;
+                    }
                 }
             }
-
-            if (needRefresh) {
-                break; // short-circuit if result from any of the selectors is changed
-            }
-        }
+            return needRefresh;
+        };
+        
+        let needRefresh: boolean;
+        needRefresh = await this.#executeWithFailoverPolicy(funcToExecute);
 
         if (needRefresh) {
             try {
@@ -517,14 +569,18 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
      * Get a configuration setting by key and label. If the setting is not found, return undefine instead of throwing an error.
      */
     async #getConfigurationSetting(configurationSettingId: ConfigurationSettingId, customOptions?: GetConfigurationSettingOptions): Promise<GetConfigurationSettingResponse | undefined> {
-        let response: GetConfigurationSettingResponse | undefined;
-        try {
-            response = await getConfigurationSettingWithTrace(
+        const funcToExecute = async (client) => {
+            return getConfigurationSettingWithTrace(
                 this.#requestTraceOptions,
-                this.#client,
+                client,
                 configurationSettingId,
                 customOptions
             );
+        };
+
+        let response: GetConfigurationSettingResponse | undefined;
+        try {
+            response = await this.#executeWithFailoverPolicy(funcToExecute);
         } catch (error) {
             if (isRestError(error) && error.statusCode === 404) {
                 response = undefined;
@@ -578,3 +634,7 @@ function getValidFeatureFlagSelectors(selectors?: SettingSelector[]): SettingSel
         return getValidSelectors(selectors);
     }
 }
+
+function isFailoverableError(error: any): boolean {
+    return (error instanceof RestError) && (error.statusCode === 408 || error.statusCode === 429 || (error.statusCode !== undefined && error.statusCode >= 500));
+}