Merge pull request #210 from meetfranz/feature/harden-franz

Feature/harden franz

4 files changed, 21 insertions, 7 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 8b0b7563c..932b70cdc 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -499,7 +499,7 @@ export default class ServerApi {
 
         return recipe;
       }),
-    ).catch(err => console.error(err));
+    ).catch(err => console.error('Can\'t load recipe', err));
   }
 
   _mapRecipePreviewModel(recipes) {
@@ -562,9 +562,16 @@ export default class ServerApi {
         .filter(file => fs.statSync(path.join(recipesDirectory, file)).isDirectory() && file !== 'temp');
 
       const recipes = paths.map((id) => {
-        // eslint-disable-next-line
-        const Recipe = require(id)(RecipeModel);
-        return new Recipe(loadRecipeConfig(id));
+        let Recipe;
+        try {
+          // eslint-disable-next-line
+          Recipe = require(id)(RecipeModel);
+          return new Recipe(loadRecipeConfig(id));
+        } catch (err) {
+          console.error(err);
+        }
+
+        return false;
       }).filter(recipe => recipe.id).map((data) => {
         const recipe = data;
 
@@ -579,7 +586,7 @@ export default class ServerApi {
 
       return recipes;
     } catch (err) {
-      console.debug('Folder `recipe/dev` does not exist');
+      console.debug('Could not load dev recipes');
       return false;
     }
   }
diff --git a/src/index.js b/src/index.js
index a72d76f3a..a3aa14732 100644
--- a/src/index.js
+++ b/src/index.js
@@ -18,6 +18,7 @@ let willQuitApp = false;
 
 // Ensure that the recipe directory exists
 fs.ensureDir(path.join(app.getPath('userData'), 'recipes'));
+fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
 
 // Set App ID for Windows
 if (isWindows) {
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 4b613a40c..9971df77c 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -26,7 +26,8 @@ export default class Recipe {
     }
 
     if (!data.id) {
-      throw Error('Recipe requires Id');
+      // Franz 4 recipes do not have an Id
+      throw Error(`Recipe '${data.name}' requires Id`);
     }
 
     this.id = data.id || this.id;
diff --git a/src/models/Service.js b/src/models/Service.js
index 7a0310ebc..484252e7c 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -58,7 +58,12 @@ export default class Service {
 
   @computed get url() {
     if (this.recipe.hasCustomUrl && this.customUrl) {
-      let url = normalizeUrl(this.customUrl);
+      let url;
+      try {
+        url = normalizeUrl(this.customUrl);
+      } catch (err) {
+        console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
+      }
 
       if (typeof this.recipe.buildUrl === 'function') {
         url = this.recipe.buildUrl(url);