Updated to v 1.4.3

Author: PeterBWu

JSDOC.md

@@ -1,4 +1,4 @@
-# offline-persistence-toolkit 1.4.2 #
+# offline-persistence-toolkit 1.4.3 #
 
 ## Introduction ##
 

README.md

@@ -1,4 +1,4 @@
-# offline-persistence-toolkit 1.4.2 #
+# offline-persistence-toolkit 1.4.3 #
 
 offline-persistence-toolkit is a client-side JavaScript library that provides caching and offline support at the HTTP request layer. This support is transparent to the user and is done through the Fetch API and an XHR adapter. HTTP requests made while the client device is offline are captured for replay when connection to the server is restored. Additional capabilities include a persistent storage layer, synchronization manager, binary data support and various configuration APIs for customizing the default behavior. This framework can be used in both ServiceWorker and non-ServiceWorker contexts within web and hybrid mobile apps.
 
@@ -58,16 +58,16 @@ If your app uses [RequireJS](http://www.requirejs.org/ "RequireJS"), update the
 ```javascript
   requirejs.config({
     paths: {
-      'persist' : 'js/libs/persist/v1.4.2/min'
+      'persist' : 'js/libs/persist/v1.4.3/min'
 
       // Other path mappings here
  }
 ```
-For Oracle JET apps, also open `appDir/src/js/main-release-paths.json` and add the `'persist' : 'js/libs/persist/v1.4.2/min'` entry to the list of paths.
+For Oracle JET apps, also open `appDir/src/js/main-release-paths.json` and add the `'persist' : 'js/libs/persist/v1.4.3/min'` entry to the list of paths.
 
 You can choose the name of the paths prefix. That is, you can use a different value to the ‘persist’ value shown in the examples.
 
-It is recommended to add the version number as a convention in your application build step such as `'persist' : 'js/libs/persist/v1.4.2/min'`.
+It is recommended to add the version number as a convention in your application build step such as `'persist' : 'js/libs/persist/v1.4.3/min'`.
 
 Versions of the toolkit are also available on CDN under the latest JET release. e.g.
 
@@ -91,7 +91,7 @@ And again, if you are using RequireJS, you will need to map paths for these pack
     paths: {
       'pouchdb': 'js/libs/pouchdb-7.0.0',
       'pouchfind': 'js/libs/pouchdb.find',
-      'persist' : 'js/libs/persist/v1.4.2/min'
+      'persist' : 'js/libs/persist/v1.4.3/min'
 
       // Other path mappings here
  }

USAGE.md

@@ -1,4 +1,4 @@
-# offline-persistence-toolkit 1.4.2 #
+# offline-persistence-toolkit 1.4.3 #
 
 # Introduction #
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oracle/offline-persistence-toolkit",
   "title": "Offline Persistence Toolkit",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Offline Persistence Toolkit by Oracle Corp.",
   "author": "oraclejet",
   "license": "UPL-1.0",

src/impl/PersistenceSyncManager.js

@@ -218,17 +218,7 @@ define(['require', '../persistenceUtils', '../persistenceStoreManager', './defau
                             logger.log("Offline Persistence Toolkit PersistenceSyncManager: Removing replayed request");
                             self._internalRemoveRequest(requestId, request).then(function () {
                               requests.shift();
-                              if (request.method == 'GET' ||
-                                request.method == 'HEAD') {
-                                persistenceUtils._cloneResponse(responseClone, {url: request.url}).then(function(responseClone) {
-                                  self._cache().put(request, responseClone).then(function () {
-                                    logger.log("Offline Persistence Toolkit PersistenceSyncManager: Replayed request/response is cached.");
-                                    replayRequestArray(requests);
-                                  });
-                                });
-                              } else {
-                                replayRequestArray(requests);
-                              }
+                              replayRequestArray(requests);
                             }, function (err) {
                               reject({'error': err, 'requestId': requestId, 'request': requestClone.clone()});
                             });

test/integration/test.js

@@ -3,9 +3,11 @@ define(['persist/persistenceManager', 'persist/persistenceUtils',
         'persist/fetchStrategies', 
         'persist/persistenceStoreManager', 'persist/localPersistenceStoreFactory',
         'persist/simpleJsonShredding', 'persist/oracleRestJsonShredding', 
-        'MockFetch', 'persist/impl/logger'],
+        'MockFetch', 'persist/impl/logger', 'persist/impl/defaultCacheHandler'],
   function (persistenceManager, persistenceUtils, defaultResponseProxy, 
-    queryHandlers, fetchStrategies, persistenceStoreManager, localPersistenceStoreFactory, simpleJsonShredding, oracleRestJsonShredding, MockFetch, logger) {
+    queryHandlers, fetchStrategies, persistenceStoreManager, 
+    localPersistenceStoreFactory, simpleJsonShredding, 
+    oracleRestJsonShredding, MockFetch, logger, cacheHandler) {
     'use strict';
     logger.option('level',  logger.LEVEL_LOG);
     QUnit.module('persist/integration', {
@@ -30,6 +32,14 @@ define(['persist/persistenceManager', 'persist/persistenceUtils',
           } else {
             return Promise.resolve();
           }
+        }).then(function () {
+          return persistenceStoreManager.openStore('SyncCache');
+        }).then(function (store) {
+          if (store) {
+            return store.delete();
+          } else {
+            return Promise.resolve();
+          }
         }).then(function () {
           done();
         });
@@ -110,7 +120,88 @@ define(['persist/persistenceManager', 'persist/persistenceUtils',
             });
           });
         });
-    
+        
+      QUnit.test('Integration - sync replay with cache handling', function (assert) {
+        var done = assert.async();
+        //assert.expect(6);
+        mockFetch.addRequestReply('GET', '/testSyncCacheHandling/1001', {
+          status: 200,
+          body: JSON.stringify({DepartmentId: 1001, DepartmentName: 'ADFPM 1001 neverending', LocationId: 200, ManagerId: 300})
+        }, function () {
+          assert.ok(true, 'Mock Fetch received Request when online');
+        });
+        mockFetch.addRequestReply('GET', '/testSyncCacheHandling', {
+          status: 200,
+          body: JSON.stringify([{DepartmentId: 1001, DepartmentName: 'ADFPM 1001 neverending', LocationId: 200, ManagerId: 300},
+                                {DepartmentId: 556, DepartmentName: 'BB', LocationId: 200, ManagerId: 300},
+                                {DepartmentId: 10, DepartmentName: 'Administration', LocationId: 200, ManagerId: 300}])
+        }, function () {
+          assert.ok(true, 'Mock Fetch received Request when online');
+        });
+
+        persistenceManager.register({
+          scope: '/testSyncCacheHandling'
+        }).then(function (registration) {
+          var options = {
+            jsonProcessor: {
+              shredder: simpleJsonShredding.getShredder('SyncCache', 'DepartmentId'), 
+              unshredder: simpleJsonShredding.getUnshredder()
+            }, 
+            queryHandler: queryHandlers.getSimpleQueryHandler('SyncCache'),
+            fetchStrategy: fetchStrategies.getCacheIfOfflineStrategy({
+              backgroundFetch: 'disabled'
+            })
+          };
+          var defaultTestResponseProxy = defaultResponseProxy.getResponseProxy(options);
+          registration.addEventListener('fetch', defaultTestResponseProxy.getFetchEventListener());
+          var store;
+          var endpointKey;
+          fetch('/testSyncCacheHandling').then(function (response) {
+            assert.ok(true, 'Received Response when online');
+            return persistenceStoreManager.openStore('SyncCache');
+          }).then(function (pstore) {
+            store = pstore;
+            return store.findByKey(1001);
+          }).then(function (data) {
+            assert.ok(data.DepartmentName == 'ADFPM 1001 neverending', 'Found DepartmentId 1001 in localStore');
+            return store.findByKey(556);
+          }).then(function (data) {
+            assert.ok(data.DepartmentName == 'BB', 'Found DepartmentId 556 in localStore');
+            return store.findByKey(10);
+          }).then(function (data) {
+            assert.ok(data.DepartmentName == 'Administration', 'Found DepartmentId 10 in localStore');
+            persistenceManager.forceOffline(true);
+            return fetch('/testSyncCacheHandling/1001');
+          }).then(function(response) {
+            return response.text();
+          }).then(function(payload) {
+            var data = JSON.parse(payload);
+            assert.ok(data.DepartmentName === 'ADFPM 1001 neverending');
+            persistenceManager.forceOffline(true);
+            return persistenceManager.getSyncManager().sync();
+          }).then(function() {
+            return fetch('/testSyncCacheHandling/1001');
+          }).then(function(response) {
+            return response.text();
+          }).then(function(payload) {
+            var data = JSON.parse(payload);
+            assert.ok(data.DepartmentName === 'ADFPM 1001 neverending');
+            var request = new Request('/testSyncCacheHandling/1001');
+            endpointKey = persistenceUtils.buildEndpointKey(request);
+            cacheHandler.registerEndpointOptions(endpointKey, options);
+            return options.queryHandler(request, options);
+          }).then(function(response) {
+            assert.ok(response != null);
+            return response.text();
+          }).then(function(payload) {
+            var data = JSON.parse(payload);
+            assert.ok(data.DepartmentName === 'ADFPM 1001 neverending');
+            cacheHandler.unregisterEndpointOptions(endpointKey);
+            done();
+          });
+        });
+      });
+                
 /*
       QUnit.test('Integration', function (assert) {
         var done = assert.async();