Merge branch 'master' into mcarroll/optimizely-sdk-typescript

Author: Matt Carroll

.travis.yml

@@ -24,9 +24,11 @@ after_success: npm run coveralls
 
 # Integration tests need to run first to reset the PR build status to pending
 stages:
-  - name: 'Lint markdown files'
+  - 'Source Clear'
+  - 'Lint markdown files'
   - 'Lint'
   - 'Integration tests'
+  - 'Full stack production tests'
   - 'Cross-browser and umd unit tests'
   - 'Test'
   - 'Test sub packages'
@@ -45,10 +47,9 @@ jobs:
     - stage: 'Lint'
       node_js: '12'
       script: npm run lint
+
     - &integrationtest
       stage: 'Integration tests'
-      addons:
-        srcclr: true
       merge_mode: replace
       cache: false
       language: minimal
@@ -60,6 +61,15 @@ jobs:
         - CLIENT=node $HOME/travisci-tools/trigger-script-with-status-update.sh
         - CLIENT=browser $HOME/travisci-tools/trigger-script-with-status-update.sh
       after_success: travis_terminate 0
+
+    - <<: *integrationtest
+      stage: 'Full stack production tests'
+      env:
+        SDK=javascript
+        SDK_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH
+        FULLSTACK_TEST_REPO=ProdTesting
+      script: $HOME/travisci-tools/trigger-script-with-status-update.sh
+
     - stage: Cross-browser and umd unit tests
       node_js: '8'
       script: npm run test-ci
@@ -74,3 +84,14 @@ jobs:
     - <<: *packagetest
       before_script: npm install "@react-native-community/async-storage"
       before_install: cd packages/datafile-manager
+
+    - stage: 'Source Clear'
+      if: type = cron
+      addons:
+        srcclr: true
+      before_install: skip
+      install: skip
+      before_script: skip
+      script: skip
+      after_script: skip
+      after_success: skip

packages/datafile-manager/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 Changes that have landed but are not yet released.
 
+## [0.7.0] - July 28, 2020
+
+### Changed
+
+- Move React Native async storage implementation to datafile manager
+
 ## [0.6.0] - June 8, 2020
 
 ### New Features

packages/datafile-manager/__test__/httpPollingDatafileManager.spec.ts

@@ -18,7 +18,7 @@ import HttpPollingDatafileManager from '../src/httpPollingDatafileManager';
 import { Headers, AbortableRequest, Response } from '../src/http';
 import { DatafileManagerConfig } from '../src/datafileManager';
 import { advanceTimersByTime, getTimerCount } from './testUtils';
-import { PersistentKeyValueCache } from '@optimizely/js-sdk-utils';
+import PersistentKeyValueCache from '../src/persistentKeyValueCache';
 
 jest.mock('../src/backoffController', () => {
   return jest.fn().mockImplementation(() => {

packages/utils/__tests__/reactNativeAsyncStorageCache.spec.ts renamed to packages/datafile-manager/__test__/reactNativeAsyncStorageCache.spec.ts

@@ -1,6 +1,6 @@
 {
   "name": "@optimizely/js-sdk-datafile-manager",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Optimizely Full Stack Datafile Manager",
   "repository": {
     "type": "git",
@@ -13,6 +13,7 @@
   },
   "main": "lib/index.node.js",
   "browser": "lib/index.browser.js",
+  "react-native": "lib/index.react_native.js",
   "types": "lib/index.d.ts",
   "directories": {
     "lib": "lib",
@@ -48,7 +49,7 @@
   },
   "dependencies": {
     "@optimizely/js-sdk-logging": "^0.1.0",
-    "@optimizely/js-sdk-utils": "^0.3.2",
+    "@optimizely/js-sdk-utils": "^0.4.0",
     "decompress-response": "^4.2.1"
   },
   "peerDependencies": {

packages/datafile-manager/package-lock.json

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { PersistentKeyValueCache } from '@optimizely/js-sdk-utils';
+import PersistentKeyValueCache from './persistentKeyValueCache';
 
 export interface DatafileUpdate {
   datafile: object;

packages/datafile-manager/package.json

@@ -15,12 +15,13 @@
  */
 
 import { getLogger } from '@optimizely/js-sdk-logging';
-import { sprintf, PersistentKeyValueCache } from '@optimizely/js-sdk-utils';
+import { sprintf } from '@optimizely/js-sdk-utils';
 import { DatafileManager, DatafileManagerConfig, DatafileUpdate } from './datafileManager';
 import EventEmitter, { Disposer } from './eventEmitter';
 import { AbortableRequest, Response, Headers } from './http';
 import { DEFAULT_UPDATE_INTERVAL, MIN_UPDATE_INTERVAL, DEFAULT_URL_TEMPLATE } from './config';
 import BackoffController from './backoffController';
+import PersistentKeyValueCache from './persistentKeyValueCache';
 
 const logger = getLogger('DatafileManager');
 

packages/datafile-manager/src/datafileManager.ts

@@ -0,0 +1,55 @@
+/**
+ * Copyright 2020, 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 { getLogger } from '@optimizely/js-sdk-logging';
+import AsyncStorage from '@react-native-community/async-storage';
+
+import PersistentKeyValueCache from './persistentKeyValueCache';
+
+const logger = getLogger('DatafileManager');
+
+export default class ReactNativeAsyncStorageCache implements PersistentKeyValueCache {
+  get(key: string): Promise<any | null> {
+    return AsyncStorage.getItem(key).then((val: string | null) => {
+      if (!val) {
+        return null;
+      }
+      try {
+        return JSON.parse(val);
+      } catch (ex) {
+        logger.error('Error Parsing Object from cache - %s', ex);
+        throw ex;
+      }
+    });
+  }
+
+  set(key: string, val: any): Promise<void> {
+    try {
+      return AsyncStorage.setItem(key, JSON.stringify(val));
+    } catch (ex) {
+      logger.error('Error stringifying Object to Json - %s', ex);
+      return Promise.reject(ex);
+    }
+  }
+
+  contains(key: string): Promise<boolean> {
+    return AsyncStorage.getItem(key).then((val: string | null) => val !== null);
+  }
+
+  remove(key: string): Promise<void> {
+    return AsyncStorage.removeItem(key);
+  }
+}