Merge branch 'adamcarheden-cache-async'

Author: MarkusBordihn

package-lock.json

@@ -30,7 +30,7 @@
     "make-dir": "^1.3.0",
     "markdownlint": "^0.8.1",
     "markdownlint-cli": "^0.8.1",
-    "nw": "^0.31.4",
+    "nw": "^0.31.5",
     "nw-builder": "^3.5.4",
     "replace-in-file": "^3.4.0",
     "rimraf": "^2.6.2"

package.json

@@ -73,60 +73,63 @@ cwc.Cache.prototype.prepare = async function() {
 /**
  * @param {!string|number} version
  */
-cwc.Cache.prototype.update = function(version) {
+cwc.Cache.prototype.update = async function(version) {
   if (version && this.version <= version) {
     this.log_.info('No updates needed', version, '>=', this.version);
     return;
   }
 
   this.log_.info('Updating Cache to version', this.version);
-  this.database_.clear();
+  await this.database_.clear();
 
   this.log_.info('Loading external frameworks ...');
-  this.loadFiles(cwc.framework.External);
+  await this.loadFiles(cwc.framework.External);
 
   this.log_.info('Loading internal frameworks ...');
-  this.loadFiles(cwc.framework.Internal);
+  await this.loadFiles(cwc.framework.Internal);
 
   this.log_.info('Loading Style Sheets ...');
-  this.loadFiles(cwc.framework.StyleSheet);
+  await this.loadFiles(cwc.framework.StyleSheet);
 
-  this.database_.add('__version__', this.version);
+  await this.database_.add('__version__', this.version);
 };
 
 
 /**
  * Loads files into cache.
  * @param {!Object} files
  */
-cwc.Cache.prototype.loadFiles = function(files) {
+cwc.Cache.prototype.loadFiles = async function(files) {
+  let promises = [];
   for (let file of Object.keys(files)) {
     if (goog.isString(files[file])) {
-      cwc.utils.Resources.getUriAsText('..' + files[file]).then((content) => {
-        this.addFile(files[file], content);
-      });
+        promises.push(cwc.utils.Resources.getUriAsText('..' + files[file])
+          .then((content) => {
+            return this.addFile(files[file], content);
+          }));
     } else {
       for (let subFile of Object.keys(files[file])) {
-        cwc.utils.Resources.getUriAsText('..' + files[file][subFile]).then(
-          (content) => {
-            this.addFile(files[file][subFile], content);
-        });
+        promises.push(cwc.utils.Resources.getUriAsText('..' +
+          files[file][subFile]).then((content) => {
+            return this.addFile(files[file][subFile], content);
+          }));
       }
     }
   }
+  await Promise.all(promises);
 };
 
 
 /**
  * @param {string!} name
  * @param {string!} content
  */
-cwc.Cache.prototype.addFile = function(name, content) {
+cwc.Cache.prototype.addFile = async function(name, content) {
   if (!content) {
     this.log_.error('Received empty content for', name);
     return;
   }
-  this.database_.add(name, content);
+  await this.database_.add(name, content);
 };
 
 

src/cache/cache.js

@@ -292,6 +292,8 @@ cwc.ui.Builder.prototype.decorateUI = function() {
       this.events_.clear();
       this.loadingScreen_.hideSecondsAfterStart(3000);
       resolve();
+    }).catch((error) => {
+      this.log_.error('Failed to load cache', error);
     });
   });
 };