2 files changed, 50 insertions, 35 deletions

diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index 383f38b16..2d9af416f 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -3,7 +3,7 @@ import du from 'du';
 
 import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js';
 
-const debug = require('debug')('Franz:LocalApi');
+const debug = require('debug')('Ferdi:LocalApi');
 
 const { session } = remote;
 
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 1f538368d..a5d636b4e 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -15,6 +15,8 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
 
 import { API } from '../../environment';
+import { RECIPES_PATH } from '../../config';
+import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
 import {
@@ -27,7 +29,7 @@ import {
   removeServicePartitionDirectory,
 } from '../../helpers/service-helpers.js';
 
-const debug = require('debug')('Franz:ServerApi');
+const debug = require('debug')('Ferdi:ServerApi');
 
 module.paths.unshift(
   getDevRecipeDirectory(),
@@ -38,8 +40,6 @@ const { app } = remote;
 const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
-const API_VERSION = 'v1';
-const API_URL = `${SERVER_URL}/${API_VERSION}`;
 
 export default class ServerApi {
   recipePreviews = [];
@@ -48,7 +48,7 @@ export default class ServerApi {
 
   // User
   async login(email, passwordHash) {
-    const request = await sendAuthRequest(`${API_URL}/auth/login`, {
+    const request = await sendAuthRequest(`${apiBase()}/auth/login`, {
       method: 'POST',
       headers: {
         Authorization: `Basic ${window.btoa(`${email}:${passwordHash}`)}`,
@@ -64,7 +64,7 @@ export default class ServerApi {
   }
 
   async signup(data) {
-    const request = await sendAuthRequest(`${API_URL}/auth/signup`, {
+    const request = await sendAuthRequest(`${apiBase()}/auth/signup`, {
       method: 'POST',
       body: JSON.stringify(data),
     }, false);
@@ -78,7 +78,7 @@ export default class ServerApi {
   }
 
   async activateTrial(data) {
-    const request = await sendAuthRequest(`${API_URL}/payment/trial`, {
+    const request = await sendAuthRequest(`${apiBase()}/payment/trial`, {
       method: 'POST',
       body: JSON.stringify(data),
     });
@@ -92,7 +92,7 @@ export default class ServerApi {
   }
 
   async inviteUser(data) {
-    const request = await sendAuthRequest(`${API_URL}/invite`, {
+    const request = await sendAuthRequest(`${apiBase()}/invite`, {
       method: 'POST',
       body: JSON.stringify(data),
     });
@@ -105,7 +105,7 @@ export default class ServerApi {
   }
 
   async retrievePassword(email) {
-    const request = await sendAuthRequest(`${API_URL}/auth/password`, {
+    const request = await sendAuthRequest(`${apiBase()}/auth/password`, {
       method: 'POST',
       body: JSON.stringify({
         email,
@@ -121,7 +121,7 @@ export default class ServerApi {
   }
 
   async userInfo() {
-    const request = await sendAuthRequest(`${API_URL}/me`);
+    const request = await sendAuthRequest(`${apiBase()}/me`);
     if (!request.ok) {
       throw request;
     }
@@ -134,7 +134,7 @@ export default class ServerApi {
   }
 
   async updateUserInfo(data) {
-    const request = await sendAuthRequest(`${API_URL}/me`, {
+    const request = await sendAuthRequest(`${apiBase()}/me`, {
       method: 'PUT',
       body: JSON.stringify(data),
     });
@@ -149,7 +149,7 @@ export default class ServerApi {
   }
 
   async deleteAccount() {
-    const request = await sendAuthRequest(`${API_URL}/me`, {
+    const request = await sendAuthRequest(`${apiBase()}/me`, {
       method: 'DELETE',
     });
     if (!request.ok) {
@@ -163,7 +163,7 @@ export default class ServerApi {
 
   // Services
   async getServices() {
-    const request = await sendAuthRequest(`${API_URL}/me/services`);
+    const request = await sendAuthRequest(`${apiBase()}/me/services`);
     if (!request.ok) {
       throw request;
     }
@@ -176,7 +176,7 @@ export default class ServerApi {
   }
 
   async createService(recipeId, data) {
-    const request = await sendAuthRequest(`${API_URL}/service`, {
+    const request = await sendAuthRequest(`${apiBase()}/service`, {
       method: 'POST',
       body: JSON.stringify(Object.assign({
         recipeId,
@@ -206,7 +206,7 @@ export default class ServerApi {
       await this.uploadServiceIcon(serviceId, data.iconFile);
     }
 
-    const request = await sendAuthRequest(`${API_URL}/service/${serviceId}`, {
+    const request = await sendAuthRequest(`${apiBase()}/service/${serviceId}`, {
       method: 'PUT',
       body: JSON.stringify(data),
     });
@@ -234,7 +234,7 @@ export default class ServerApi {
 
     delete requestData.headers['Content-Type'];
 
-    const request = await window.fetch(`${API_URL}/service/${serviceId}`, requestData);
+    const request = await window.fetch(`${apiBase()}/service/${serviceId}`, requestData);
 
     if (!request.ok) {
       throw request;
@@ -246,7 +246,7 @@ export default class ServerApi {
   }
 
   async reorderService(data) {
-    const request = await sendAuthRequest(`${API_URL}/service/reorder`, {
+    const request = await sendAuthRequest(`${apiBase()}/service/reorder`, {
       method: 'PUT',
       body: JSON.stringify(data),
     });
@@ -259,7 +259,7 @@ export default class ServerApi {
   }
 
   async deleteService(id) {
-    const request = await sendAuthRequest(`${API_URL}/service/${id}`, {
+    const request = await sendAuthRequest(`${apiBase()}/service/${id}`, {
       method: 'DELETE',
     });
     if (!request.ok) {
@@ -275,7 +275,7 @@ export default class ServerApi {
 
   // Features
   async getDefaultFeatures() {
-    const request = await sendAuthRequest(`${API_URL}/features/default`);
+    const request = await sendAuthRequest(`${apiBase()}/features/default`);
     if (!request.ok) {
       throw request;
     }
@@ -287,7 +287,7 @@ export default class ServerApi {
   }
 
   async getFeatures() {
-    const request = await sendAuthRequest(`${API_URL}/features`);
+    const request = await sendAuthRequest(`${apiBase()}/features`);
     if (!request.ok) {
       throw request;
     }
@@ -321,7 +321,7 @@ export default class ServerApi {
   }
 
   async getRecipeUpdates(recipeVersions) {
-    const request = await sendAuthRequest(`${API_URL}/recipes/update`, {
+    const request = await sendAuthRequest(`${apiBase()}/recipes/update`, {
       method: 'POST',
       body: JSON.stringify(recipeVersions),
     });
@@ -335,7 +335,7 @@ export default class ServerApi {
 
   // Recipes Previews
   async getRecipePreviews() {
-    const request = await sendAuthRequest(`${API_URL}/recipes`);
+    const request = await sendAuthRequest(`${apiBase()}/recipes`);
     if (!request.ok) throw request;
     const data = await request.json();
     const recipePreviews = this._mapRecipePreviewModel(data);
@@ -344,7 +344,7 @@ export default class ServerApi {
   }
 
   async getFeaturedRecipePreviews() {
-    const request = await sendAuthRequest(`${API_URL}/recipes/popular`);
+    const request = await sendAuthRequest(`${apiBase()}/recipes/popular`);
     if (!request.ok) throw request;
 
     const data = await request.json();
@@ -356,7 +356,7 @@ export default class ServerApi {
   }
 
   async searchRecipePreviews(needle) {
-    const url = `${API_URL}/recipes/search?needle=${needle}`;
+    const url = `${apiBase()}/recipes/search?needle=${needle}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
 
@@ -370,14 +370,29 @@ export default class ServerApi {
     try {
       const recipesDirectory = path.join(app.getPath('userData'), 'recipes');
       const recipeTempDirectory = path.join(recipesDirectory, 'temp', recipeId);
-      const archivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
-      const packageUrl = `${API_URL}/recipes/download/${recipeId}`;
+      const tempArchivePath = path.join(recipeTempDirectory, 'recipe.tar.gz');
+
+      const internalRecipeFile = path.join(RECIPES_PATH, `${recipeId}.tar.gz`);
 
       fs.ensureDirSync(recipeTempDirectory);
-      const res = await fetch(packageUrl);
-      debug('Recipe downloaded', recipeId);
-      const buffer = await res.buffer();
-      fs.writeFileSync(archivePath, buffer);
+
+      let archivePath;
+
+      if (await fs.exists(internalRecipeFile)) {
+        console.log('[ServerApi::getRecipePackage] Using internal recipe file');
+        archivePath = internalRecipeFile;
+      } else {
+        console.log('[ServerApi::getRecipePackage] Downloading recipe from server');
+        archivePath = tempArchivePath;
+
+        const packageUrl = `${apiBase()}/recipes/download/${recipeId}`;
+
+        const res = await fetch(packageUrl);
+        debug('Recipe downloaded', recipeId);
+        const buffer = await res.buffer();
+        fs.writeFileSync(archivePath, buffer);
+      }
+      console.log(archivePath);
 
       await sleep(10);
 
@@ -408,7 +423,7 @@ export default class ServerApi {
 
   // Payment
   async getPlans() {
-    const request = await sendAuthRequest(`${API_URL}/payment/plans`);
+    const request = await sendAuthRequest(`${apiBase()}/payment/plans`);
     if (!request.ok) throw request;
     const data = await request.json();
     const plan = new PlanModel(data);
@@ -417,7 +432,7 @@ export default class ServerApi {
   }
 
   async getHostedPage(planId) {
-    const request = await sendAuthRequest(`${API_URL}/payment/init`, {
+    const request = await sendAuthRequest(`${apiBase()}/payment/init`, {
       method: 'POST',
       body: JSON.stringify({
         planId,
@@ -434,7 +449,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${API_URL}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const url = `${apiBase()}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -444,7 +459,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`${API_URL}/news/${id}/read`);
+    const request = await sendAuthRequest(`${apiBase()}/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
@@ -469,7 +484,7 @@ export default class ServerApi {
       if (Object.prototype.hasOwnProperty.call(config, 'services')) {
         const services = await Promise.all(config.services.map(async (s) => {
           const service = s;
-          const request = await sendAuthRequest(`${API_URL}/recipes/${s.service}`);
+          const request = await sendAuthRequest(`${apiBase()}/recipes/${s.service}`);
 
           if (request.status === 200) {
             const data = await request.json();