cordova-app-loader - npm Package Compare versions

Comparing version 0.1.0 to 0.1.1

index.js

@@ -33,7 +33,2 @@ var CordovaFileCache = require('cordova-file-cache');
   return new Promise(function(resolve,reject){
-    if(self.newManifest && !newManifest) {
-      console.warn('CordovaAppLoader: Already checked for new manifest.');
-      resolve(self.newManifest);
-      return;
-    }
     if(typeof newManifest === "string") {
@@ -48,9 +43,6 @@ self.newManifestUrl = newManifest;
         if(!newManifest.files){
-          reject('Downloaded Manifest is has no "files" attribute.');
+          reject('Downloaded Manifest has no "files" attribute.');
           return;
         }
-        // Save the new Manifest
-        self.newManifest = newManifest;
-        self.newManifest.root = self.cache.toInternalURL('/') + (self.newManifest.root || '');
-
+  
         // Create the diff
@@ -70,3 +62,10 @@ self._toBeDownloaded = Object.keys(newManifest.files)
 
-        resolve(self.canDownload() || self.canUpdate());
+        if(self._toBeDeleted.length > 0){
+          // Save the new Manifest
+          self.newManifest = newManifest;
+          self.newManifest.root = self.cache.toInternalURL('/') + (self.newManifest.root || '');
+          resolve(true);
+        } else {
+          resolve(false);
+        }
       },reject);
@@ -83,3 +82,3 @@ }
 AppLoader.prototype.canDownload = function(){
-  return this._toBeDeleted.length > 0 || this.cache.isDirty();
+  return !!this.newManifest;
 };
@@ -93,2 +92,8 @@
   var self = this;
+  if(!self.canDownload()) {
+    return Promise.resolve(null);
+  }
+  // we will delete files, which will invalidate the current manifest...
+  localStorage.removeItem('manifest');
+  this.manifest.files = Manifest.files = {};
   return self.cache.remove(self._toBeDeleted,true)
@@ -100,6 +105,4 @@ .then(function(){
       self._toBeDeleted = [];
-      // We deleted stuff, so we MUST load new manifest on next load!
-      localStorage.setItem('manifest',JSON.stringify(self.newManifest));
       self._updateReady = true;
-      return self;
+      return self.newManifest;
     });
@@ -118,2 +121,13 @@ };
 
+AppLoader.prototype.clear = function(){
+  localStorage.removeItem('manifest');
+  return this.cache.clear();
+};
+
+AppLoader.prototype.reset = function(){
+  return this.clear().then(function(){
+    location.reload();
+  });
+};
+
 module.exports = AppLoader;

package.json

 {
   "name": "cordova-app-loader",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Cordova App Loader - remote update your cordova app",
@@ -23,4 +23,4 @@ "main": "index.js",
   "dependencies": {
-    "cordova-file-cache": "^0.1.1"
+    "cordova-file-cache": "^0.2.1"
   }
 }

README.md

@@ -31,9 +31,6 @@ cordova-app-loader
 cordova plugin add org.apache.cordova.file-transfer
-cordova serve
-
-# in a new terminal tab:
 cordova run ios
 ```
 
-If you want to run on a real device, modify `serverRoot` in `www/test/test.js` to point to your local server!
+Want to run your own server? Modify `serverRoot` in `www/test/test.js`!
 
@@ -40,0 +37,0 @@ ## Usage

www/lib/CordovaAppLoader.js

@@ -80,7 +80,2 @@ var CordovaAppLoader =
 	  return new Promise(function(resolve,reject){
-	    if(self.newManifest && !newManifest) {
-	      console.warn('CordovaAppLoader: Already checked for new manifest.');
-	      resolve(self.newManifest);
-	      return;
-	    }
 	    if(typeof newManifest === "string") {
@@ -95,9 +90,6 @@ self.newManifestUrl = newManifest;
 	        if(!newManifest.files){
-	          reject('Downloaded Manifest is has no "files" attribute.');
+	          reject('Downloaded Manifest has no "files" attribute.');
 	          return;
 	        }
-	        // Save the new Manifest
-	        self.newManifest = newManifest;
-	        self.newManifest.root = self.cache.toInternalURL('/') + (self.newManifest.root || '');
-
+	  
 	        // Create the diff
@@ -117,3 +109,10 @@ self._toBeDownloaded = Object.keys(newManifest.files)
 
-	        resolve(self.canDownload() || self.canUpdate());
+	        if(self._toBeDeleted.length > 0){
+	          // Save the new Manifest
+	          self.newManifest = newManifest;
+	          self.newManifest.root = self.cache.toInternalURL('/') + (self.newManifest.root || '');
+	          resolve(true);
+	        } else {
+	          resolve(false);
+	        }
 	      },reject);
@@ -130,3 +129,3 @@ }
 	AppLoader.prototype.canDownload = function(){
-	  return this._toBeDeleted.length > 0 || this.cache.isDirty();
+	  return !!this.newManifest;
 	};
@@ -140,2 +139,8 @@
 	  var self = this;
+	  if(!self.canDownload()) {
+	    return Promise.resolve(null);
+	  }
+	  // we will delete files, which will invalidate the current manifest...
+	  localStorage.removeItem('manifest');
+	  this.manifest.files = Manifest.files = {};
 	  return self.cache.remove(self._toBeDeleted,true)
@@ -147,6 +152,4 @@ .then(function(){
 	      self._toBeDeleted = [];
-	      // We deleted stuff, so we MUST load new manifest on next load!
-	      localStorage.setItem('manifest',JSON.stringify(self.newManifest));
 	      self._updateReady = true;
-	      return self;
+	      return self.newManifest;
 	    });
@@ -165,2 +168,13 @@ };
 
+	AppLoader.prototype.clear = function(){
+	  localStorage.removeItem('manifest');
+	  return this.cache.clear();
+	};
+
+	AppLoader.prototype.reset = function(){
+	  return this.clear().then(function(){
+	    location.reload();
+	  });
+	};
+
 	module.exports = AppLoader;
@@ -167,0 +181,0 @@

www/test/test.js

 
 var fs = new CordovaPromiseFS({});
+var SERVER = 'http://data.madebymark.nl/cordova-app-loader/';
 
@@ -7,3 +8,3 @@ var loader = window.loader = new CordovaAppLoader({
   localRoot: 'app',
-  serverRoot: 'http://localhost:8000/ios/www/',
+  serverRoot: SERVER,
   mode: 'mirror'
@@ -27,3 +28,3 @@ });
   var url = $(ev.target).attr('manifest');
-  loader.check(url).then(setStatus,setStatus);
+  loader.check(SERVER+url).then(setStatus,setStatus);
 });
@@ -40,3 +41,3 @@
 $('body').on('click','.factory',function(){
-  localStorage.removeItem('manifest');
+  loader.reset();
 });
@@ -43,0 +44,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

315793

increased by0.26%

Number of package files

25

increased by4.17%

Lines of code

6434

increased by0.75%

Worsened metrics

Number of lines in readme file

125

decreased by-2.34%

Dependency changes

• + Addedcordova-file-cache@0.2.2(transitive)

• + Addedcordova-promise-fs@0.5.1(transitive)

• - Removedcordova-file-cache@0.1.1(transitive)

• - Removedcordova-promise-fs@0.4.1(transitive)

• Updatedcordova-file-cache@^0.2.1