saving

lib/common_exports.ts

@@ -17,3 +17,5 @@
 export { LogLevel, LogHandler, getLogger, setLogHandler } from './modules/logging';
 export { LOG_LEVEL } from './utils/enums';
 export { createLogger } from './plugins/logger';
+export { createStaticProjectConfigManager } from './project_config/config_manager_factory';
+export { PollingConfigManagerConfig } from './project_config/config_manager_factory';

lib/core/decision_service/index.ts

@@ -38,7 +38,7 @@ import {
   getVariationKeyFromId,
   isActive,
   ProjectConfig,
-} from '../project_config';
+} from '../../project_config';
 import { AudienceEvaluator, createAudienceEvaluator } from '../audience_evaluator';
 import * as stringValidator from '../../utils/string_value_validator';
 import {

lib/core/event_builder/event_helpers.ts

@@ -27,7 +27,7 @@ import {
   getEventId,
   getLayerId,
   ProjectConfig,
-} from '../project_config';
+} from '../../project_config';
 
 const logger = getLogger('EVENT_BUILDER');
 

lib/core/event_builder/index.ts

@@ -24,7 +24,7 @@ import {
   getLayerId,
   getVariationKeyFromId,
   ProjectConfig,
-} from '../project_config';
+} from '../../project_config';
 import * as eventTagUtils from '../../utils/event_tag_utils';
 import { isAttributeValid } from '../../utils/attributes_validator';
 import { EventTags, UserAttributes, Event as EventLoggingEndpoint } from '../../shared_types';

lib/core/optimizely_config/index.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { LoggerFacade, getLogger } from '../../modules/logging';
-import { ProjectConfig } from '../project_config';
+import { ProjectConfig } from '../../project_config';
 import { DEFAULT_OPERATOR_TYPES } from '../condition_tree_evaluator';
 import {
   Audience,

lib/index.browser.ts

@@ -27,12 +27,13 @@ import eventProcessorConfigValidator from './utils/event_processor_config_valida
 import { createNotificationCenter } from './core/notification_center';
 import { default as eventProcessor } from './plugins/event_processor';
 import { OptimizelyDecideOption, Client, Config, OptimizelyOptions } from './shared_types';
-import { createHttpPollingDatafileManager } from './plugins/datafile_manager/browser_http_polling_datafile_manager';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
 import Optimizely from './optimizely';
 import { IUserAgentParser } from './core/odp/user_agent_parser';
 import { getUserAgentParser } from './plugins/odp/user_agent_parser/index.browser';
 import * as commonExports from './common_exports';
+import { PollingConfigManagerConfig } from './project_config/config_manager_factory';
+import { createPollingProjectConfigManager } from './project_config/config_manager_factory.browser';
 
 const logger = getLogger();
 logHelper.setLogHandler(loggerPlugin.createLogger());
@@ -198,6 +199,7 @@ export {
   OptimizelyDecideOption,
   IUserAgentParser,
   getUserAgentParser,
+  createPollingProjectConfigManager,
 };
 
 export * from './common_exports';
@@ -215,6 +217,7 @@ export default {
   __internalResetRetryState,
   OptimizelyDecideOption,
   getUserAgentParser,
+  createPollingProjectConfigManager,
 };
 
 export * from './export_types';

lib/index.node.ts

@@ -25,9 +25,9 @@ import eventProcessorConfigValidator from './utils/event_processor_config_valida
 import { createNotificationCenter } from './core/notification_center';
 import { createEventProcessor } from './plugins/event_processor';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
-import { createHttpPollingDatafileManager } from './plugins/datafile_manager/http_polling_datafile_manager';
 import { NodeOdpManager } from './plugins/odp_manager/index.node';
 import * as commonExports from './common_exports';
+import { createPollingProjectConfigManager } from './project_config/config_manager_factory.node';
 
 const logger = getLogger();
 setLogLevel(LogLevel.ERROR);
@@ -144,6 +144,7 @@ export {
   setLogLevel,
   createInstance,
   OptimizelyDecideOption,
+  createPollingProjectConfigManager
 };
 
 export * from './common_exports';
@@ -158,6 +159,7 @@ export default {
   setLogLevel,
   createInstance,
   OptimizelyDecideOption,
+  createPollingProjectConfigManager
 };
 
 export * from './export_types';

lib/index.react_native.ts

@@ -25,9 +25,9 @@ import eventProcessorConfigValidator from './utils/event_processor_config_valida
 import { createNotificationCenter } from './core/notification_center';
 import { createEventProcessor } from './plugins/event_processor/index.react_native';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
-import { createHttpPollingDatafileManager } from './plugins/datafile_manager/react_native_http_polling_datafile_manager';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
 import * as commonExports from './common_exports';
+import { createPollingProjectConfigManager } from './project_config/config_manager_factory.react_native';
 
 import 'fast-text-encoding';
 import 'react-native-get-random-values';
@@ -154,6 +154,7 @@ export {
   setLogLevel,
   createInstance,
   OptimizelyDecideOption,
+  createPollingProjectConfigManager,
 };
 
 export * from './common_exports';
@@ -168,6 +169,7 @@ export default {
   setLogLevel,
   createInstance,
   OptimizelyDecideOption,
+  createPollingProjectConfigManager,
 };
 
 export * from './export_types';

lib/modules/datafile-manager/browserDatafileManager.ts

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-import { makeGetRequest } from './browserRequest';
-import HttpPollingDatafileManager from './httpPollingDatafileManager';
-import { Headers, AbortableRequest } from './http';
-import { DatafileManagerConfig } from './datafileManager';
+// import { makeGetRequest } from './browserRequest';
+// import HttpPollingDatafileManager from './httpPollingDatafileManager';
+// import { Headers, AbortableRequest } from './http';
+// import { DatafileManagerConfig } from './datafileManager';
 
-export default class BrowserDatafileManager extends HttpPollingDatafileManager {
-  protected makeGetRequest(reqUrl: string, headers: Headers): AbortableRequest {
-    return makeGetRequest(reqUrl, headers);
-  }
+// export default class BrowserDatafileManager extends HttpPollingDatafileManager {
+//   protected makeGetRequest(reqUrl: string, headers: Headers): AbortableRequest {
+//     return makeGetRequest(reqUrl, headers);
+//   }
 
-  protected getConfigDefaults(): Partial<DatafileManagerConfig> {
-    return {
-      autoUpdate: false,
-    };
-  }
-}
+//   protected getConfigDefaults(): Partial<DatafileManagerConfig> {
+//     return {
+//       autoUpdate: false,
+//     };
+//   }
+// }

lib/modules/datafile-manager/index.react_native.ts

@@ -1,18 +1,18 @@
-/**
- * Copyright 2022, Optimizely
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// /**
+//  * Copyright 2022, Optimizely
+//  *
+//  * Licensed under the Apache License, Version 2.0 (the "License");
+//  * you may not use this file except in compliance with the License.
+//  * You may obtain a copy of the License at
+//  *
+//  * http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  * Unless required by applicable law or agreed to in writing, software
+//  * distributed under the License is distributed on an "AS IS" BASIS,
+//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  * See the License for the specific language governing permissions and
+//  * limitations under the License.
+//  */
 
-export * from './datafileManager';
-export { default as HttpPollingDatafileManager } from './reactNativeDatafileManager';
+// export * from './datafileManager';
+// export { default as HttpPollingDatafileManager } from './reactNativeDatafileManager';

lib/modules/datafile-manager/reactNativeDatafileManager.ts

@@ -1,34 +1,34 @@
-/**
- * Copyright 2022, 2024, Optimizely
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// /**
+//  * Copyright 2022, 2024, Optimizely
+//  *
+//  * Licensed under the Apache License, Version 2.0 (the "License");
+//  * you may not use this file except in compliance with the License.
+//  * You may obtain a copy of the License at
+//  *
+//  * http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  * Unless required by applicable law or agreed to in writing, software
+//  * distributed under the License is distributed on an "AS IS" BASIS,
+//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  * See the License for the specific language governing permissions and
+//  * limitations under the License.
+//  */
 
-import { makeGetRequest } from './browserRequest';
-import HttpPollingDatafileManager from './httpPollingDatafileManager';
-import { Headers, AbortableRequest } from './http';
-import { DatafileManagerConfig } from './datafileManager';
-import ReactNativeAsyncStorageCache from '../../plugins/key_value_cache/reactNativeAsyncStorageCache';
+// import { makeGetRequest } from './browserRequest';
+// import HttpPollingDatafileManager from './httpPollingDatafileManager';
+// import { Headers, AbortableRequest } from './http';
+// import { DatafileManagerConfig } from './datafileManager';
+// import ReactNativeAsyncStorageCache from '../../plugins/key_value_cache/reactNativeAsyncStorageCache';
 
-export default class ReactNativeDatafileManager extends HttpPollingDatafileManager {
-  protected makeGetRequest(reqUrl: string, headers: Headers): AbortableRequest {
-    return makeGetRequest(reqUrl, headers);
-  }
+// export default class ReactNativeDatafileManager extends HttpPollingDatafileManager {
+//   protected makeGetRequest(reqUrl: string, headers: Headers): AbortableRequest {
+//     return makeGetRequest(reqUrl, headers);
+//   }
 
-  protected getConfigDefaults(): Partial<DatafileManagerConfig> {
-    return {
-      autoUpdate: true,
-      cache: new ReactNativeAsyncStorageCache(),
-    };
-  }
-}
+//   protected getConfigDefaults(): Partial<DatafileManagerConfig> {
+//     return {
+//       autoUpdate: true,
+//       cache: new ReactNativeAsyncStorageCache(),
+//     };
+//   }
+// }

lib/optimizely/index.ts

@@ -42,15 +42,15 @@ import {
 import { newErrorDecision } from '../optimizely_decision';
 import OptimizelyUserContext from '../optimizely_user_context';
 // import { createProjectConfigManager, ProjectConfigManager } from '../core/project_config/project_config_manager';
-import { ProjectConfigManager } from '../project_config__/project_config_manager';
+import { ProjectConfigManager } from '../project_config/project_config_manager';
 import { createDecisionService, DecisionService, DecisionObj } from '../core/decision_service';
 import { getImpressionEvent, getConversionEvent } from '../core/event_builder';
 import { buildImpressionEvent, buildConversionEvent } from '../core/event_builder/event_helpers';
 import { NotificationRegistry } from '../core/notification_center/notification_registry';
 import fns from '../utils/fns';
 import { validate } from '../utils/attributes_validator';
 import * as eventTagsValidator from '../utils/event_tags_validator';
-import * as projectConfig from '../core/project_config';
+import * as projectConfig from '../project_config';
 import * as userProfileServiceValidator from '../utils/user_profile_service_validator';
 import * as stringValidator from '../utils/string_value_validator';
 import * as decision from '../core/decision';

lib/plugins/datafile_manager/react_native_http_polling_datafile_manager.ts

@@ -1,54 +1,54 @@
-/**
- * Copyright 2021-2022, 2024, Optimizely
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { LoggerFacade } from '../../modules/logging';
-import { HttpPollingDatafileManager } from '../../modules/datafile-manager/index.react_native';
-import { DatafileOptions, DatafileManager, PersistentCacheProvider } from '../../shared_types';
-import { DatafileManagerConfig } from '../../modules/datafile-manager/index.react_native';
-import { toDatafile, tryCreatingProjectConfig } from '../../core/project_config';
-import fns from '../../utils/fns';
+// /**
+//  * Copyright 2021-2022, 2024, Optimizely
+//  *
+//  * Licensed under the Apache License, Version 2.0 (the "License");
+//  * you may not use this file except in compliance with the License.
+//  * You may obtain a copy of the License at
+//  *
+//  * http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  * Unless required by applicable law or agreed to in writing, software
+//  * distributed under the License is distributed on an "AS IS" BASIS,
+//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  * See the License for the specific language governing permissions and
+//  * limitations under the License.
+//  */
+// import { LoggerFacade } from '../../modules/logging';
+// import { HttpPollingDatafileManager } from '../../modules/datafile-manager/index.react_native';
+// import { DatafileOptions, DatafileManager, PersistentCacheProvider } from '../../shared_types';
+// import { DatafileManagerConfig } from '../../modules/datafile-manager/index.react_native';
+// import { toDatafile, tryCreatingProjectConfig } from '../../core/project_config';
+// import fns from '../../utils/fns';
 
-export function createHttpPollingDatafileManager(
-  sdkKey: string,
-  logger: LoggerFacade,
-  // TODO[OASIS-6649]: Don't use object type
-  // eslint-disable-next-line  @typescript-eslint/ban-types
-  datafile?: string | object,
-  datafileOptions?: DatafileOptions,
-  persistentCacheProvider?: PersistentCacheProvider,
- ): DatafileManager {  
-  const datafileManagerConfig: DatafileManagerConfig = { sdkKey };
-  if (datafileOptions === undefined || (typeof datafileOptions === 'object' && datafileOptions !== null)) {
-    fns.assign(datafileManagerConfig, datafileOptions);
-  }
-  if (datafile) {
-    const { configObj, error } = tryCreatingProjectConfig({
-      datafile: datafile,
-      jsonSchemaValidator: undefined,
-      logger: logger,
-    });
+// export function createHttpPollingDatafileManager(
+//   sdkKey: string,
+//   logger: LoggerFacade,
+//   // TODO[OASIS-6649]: Don't use object type
+//   // eslint-disable-next-line  @typescript-eslint/ban-types
+//   datafile?: string | object,
+//   datafileOptions?: DatafileOptions,
+//   persistentCacheProvider?: PersistentCacheProvider,
+//  ): DatafileManager {  
+//   const datafileManagerConfig: DatafileManagerConfig = { sdkKey };
+//   if (datafileOptions === undefined || (typeof datafileOptions === 'object' && datafileOptions !== null)) {
+//     fns.assign(datafileManagerConfig, datafileOptions);
+//   }
+//   if (datafile) {
+//     const { configObj, error } = tryCreatingProjectConfig({
+//       datafile: datafile,
+//       jsonSchemaValidator: undefined,
+//       logger: logger,
+//     });
 
-    if (error) {
-      logger.error(error);
-    }
-    if (configObj) {
-      datafileManagerConfig.datafile = toDatafile(configObj);
-    }
-  }
-  if (persistentCacheProvider) {
-    datafileManagerConfig.cache = persistentCacheProvider();
-  }
-  return new HttpPollingDatafileManager(datafileManagerConfig);
-}
+//     if (error) {
+//       logger.error(error);
+//     }
+//     if (configObj) {
+//       datafileManagerConfig.datafile = toDatafile(configObj);
+//     }
+//   }
+//   if (persistentCacheProvider) {
+//     datafileManagerConfig.cache = persistentCacheProvider();
+//   }
+//   return new HttpPollingDatafileManager(datafileManagerConfig);
+// }