From 88faef416eadc891537f03926160e35245125c72 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sun, 18 Mar 2018 16:37:21 +0100 Subject: Replace console logs with debugger --- package.json | 1 + src/api/server/LocalApi.js | 8 +++--- src/api/server/ServerApi.js | 60 +++++++++++++++++++++++---------------------- src/lib/analytics.js | 6 +++-- src/stores/RecipesStore.js | 8 +++--- src/stores/RequestStore.js | 4 ++- src/stores/ServicesStore.js | 10 +++++--- yarn.lock | 12 +++++++++ 8 files changed, 66 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index f35da9880..31013baad 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "babel-polyfill": "^6.23.0", "babel-runtime": "^6.23.0", "classnames": "^2.2.5", + "debug-electron": "^0.0.4", "du": "^0.1.0", "electron-fetch": "^1.1.0", "electron-react-titlebar": "^0.7.1", diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js index aa3a7d655..4d2497c61 100644 --- a/src/api/server/LocalApi.js +++ b/src/api/server/LocalApi.js @@ -3,6 +3,8 @@ import du from 'du'; import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'; +const debug = require('debug')('LocalApi'); + const { session } = remote; export default class LocalApi { @@ -13,7 +15,7 @@ export default class LocalApi { du(partitionsDir, (err, size) => { if (err) reject(err); - console.debug('LocalApi::getAppCacheSize resolves', size); + debug('LocalApi::getAppCacheSize resolves', size); resolve(size); }); }); @@ -22,14 +24,14 @@ export default class LocalApi { async clearCache(serviceId) { const s = session.fromPartition(`persist:service-${serviceId}`); - console.debug('LocalApi::clearCache resolves', serviceId); + debug('LocalApi::clearCache resolves', serviceId); return new Promise(resolve => s.clearCache(resolve)); } async clearAppCache() { const s = session.defaultSession; - console.debug('LocalApi::clearCache clearAppCache'); + debug('LocalApi::clearCache clearAppCache'); return new Promise(resolve => s.clearCache(resolve)); } } diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 8f3297d13..353faa7f4 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js @@ -27,6 +27,8 @@ import { removeServicePartitionDirectory, } from '../../helpers/service-helpers.js'; +const debug = require('debug')('ServerApi'); + module.paths.unshift( getDevRecipeDirectory(), getRecipeDirectory(), @@ -55,7 +57,7 @@ export default class ServerApi { } const u = await request.json(); - console.debug('ServerApi::login resolves', u); + debug('ServerApi::login resolves', u); return u.token; } @@ -69,7 +71,7 @@ export default class ServerApi { } const u = await request.json(); - console.debug('ServerApi::signup resolves', u); + debug('ServerApi::signup resolves', u); return u.token; } @@ -82,7 +84,7 @@ export default class ServerApi { throw request; } - console.debug('ServerApi::inviteUser'); + debug('ServerApi::inviteUser'); return true; } @@ -98,7 +100,7 @@ export default class ServerApi { } const r = await request.json(); - console.debug('ServerApi::retrievePassword'); + debug('ServerApi::retrievePassword'); return r; } @@ -112,7 +114,7 @@ export default class ServerApi { const data = await request.json(); const user = new UserModel(data); - console.debug('ServerApi::userInfo resolves', user); + debug('ServerApi::userInfo resolves', user); return user; } @@ -128,7 +130,7 @@ export default class ServerApi { const updatedData = await request.json(); const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) }); - console.debug('ServerApi::updateUserInfo resolves', user); + debug('ServerApi::updateUserInfo resolves', user); return user; } @@ -141,7 +143,7 @@ export default class ServerApi { } const data = await request.json(); - console.debug('ServerApi::deleteAccount resolves', data); + debug('ServerApi::deleteAccount resolves', data); return data; } @@ -157,7 +159,7 @@ export default class ServerApi { let services = await this._mapServiceModels(data); services = services.filter(service => service !== null); - console.debug('ServerApi::getServices resolves', services); + debug('ServerApi::getServices resolves', services); return services; } @@ -181,7 +183,7 @@ export default class ServerApi { const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) }); - console.debug('ServerApi::createService resolves', service); + debug('ServerApi::createService resolves', service); return service; } @@ -205,7 +207,7 @@ export default class ServerApi { const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) }); - console.debug('ServerApi::updateService resolves', service); + debug('ServerApi::updateService resolves', service); return service; } @@ -240,7 +242,7 @@ export default class ServerApi { throw request; } const serviceData = await request.json(); - console.debug('ServerApi::reorderService resolves', serviceData); + debug('ServerApi::reorderService resolves', serviceData); return serviceData; } @@ -255,7 +257,7 @@ export default class ServerApi { removeServicePartitionDirectory(id, true); - console.debug('ServerApi::deleteService resolves', data); + debug('ServerApi::deleteService resolves', data); return data; } @@ -277,7 +279,7 @@ export default class ServerApi { this.recipes = this.recipes.concat(this._getDevRecipes()); - console.debug('StubServerApi::getInstalledRecipes resolves', this.recipes); + debug('StubServerApi::getInstalledRecipes resolves', this.recipes); return this.recipes; } @@ -290,7 +292,7 @@ export default class ServerApi { throw request; } const recipes = await request.json(); - console.debug('ServerApi::getRecipeUpdates resolves', recipes); + debug('ServerApi::getRecipeUpdates resolves', recipes); return recipes; } @@ -305,7 +307,7 @@ export default class ServerApi { const data = await request.json(); const recipePreviews = this._mapRecipePreviewModel(data); - console.debug('ServerApi::getRecipes resolves', recipePreviews); + debug('ServerApi::getRecipes resolves', recipePreviews); return recipePreviews; } @@ -322,7 +324,7 @@ export default class ServerApi { // data = this._addLocalRecipesToPreviews(data); const recipePreviews = this._mapRecipePreviewModel(data); - console.debug('ServerApi::getFeaturedRecipes resolves', recipePreviews); + debug('ServerApi::getFeaturedRecipes resolves', recipePreviews); return recipePreviews; } @@ -336,7 +338,7 @@ export default class ServerApi { const data = await request.json(); const recipePreviews = this._mapRecipePreviewModel(data); - console.debug('ServerApi::searchRecipePreviews resolves', recipePreviews); + debug('ServerApi::searchRecipePreviews resolves', recipePreviews); return recipePreviews; } @@ -350,7 +352,7 @@ export default class ServerApi { fs.ensureDirSync(recipeTempDirectory); const res = await fetch(packageUrl); - console.debug('Recipe downloaded', recipeId); + debug('Recipe downloaded', recipeId); const buffer = await res.buffer(); fs.writeFileSync(archivePath, buffer); @@ -392,7 +394,7 @@ export default class ServerApi { const data = await request.json(); const plan = new PlanModel(data); - console.debug('ServerApi::getPlans resolves', plan); + debug('ServerApi::getPlans resolves', plan); return plan; } @@ -408,7 +410,7 @@ export default class ServerApi { } const data = await request.json(); - console.debug('ServerApi::getHostedPage resolves', data); + debug('ServerApi::getHostedPage resolves', data); return data; } @@ -421,7 +423,7 @@ export default class ServerApi { } const data = await request.json(); - console.debug('ServerApi::getPaymentDashboardUrl resolves', data); + debug('ServerApi::getPaymentDashboardUrl resolves', data); return data; } @@ -434,7 +436,7 @@ export default class ServerApi { } const data = await request.json(); const orders = this._mapOrderModels(data); - console.debug('ServerApi::getSubscriptionOrders resolves', orders); + debug('ServerApi::getSubscriptionOrders resolves', orders); return orders; } @@ -451,7 +453,7 @@ export default class ServerApi { } const data = await request.json(); const news = this._mapNewsModels(data); - console.debug('ServerApi::getLatestNews resolves', news); + debug('ServerApi::getLatestNews resolves', news); return news; } @@ -465,7 +467,7 @@ export default class ServerApi { throw request; } - console.debug('ServerApi::hideNews resolves', id); + debug('ServerApi::hideNews resolves', id); } // Health Check @@ -476,7 +478,7 @@ export default class ServerApi { if (!request.ok) { throw request; } - console.debug('ServerApi::healthCheck resolves'); + debug('ServerApi::healthCheck resolves'); } async getLegacyServices() { @@ -502,7 +504,7 @@ export default class ServerApi { return service; })); - console.debug('ServerApi::getLegacyServices resolves', services); + debug('ServerApi::getLegacyServices resolves', services); return services; } } catch (err) { @@ -535,7 +537,7 @@ export default class ServerApi { return new ServiceModel(service, recipe); } catch (e) { - console.debug(e); + debug(e); return null; } } @@ -553,7 +555,7 @@ export default class ServerApi { await this.getRecipePackage(recipeId); - console.debug('Rerun ServerAPI::getInstalledRecipes'); + debug('Rerun ServerAPI::getInstalledRecipes'); await this.getInstalledRecipes(); recipe = this.recipes.find(r => r.id === recipeId); @@ -653,7 +655,7 @@ export default class ServerApi { return recipes; } catch (err) { - console.debug('Could not load dev recipes'); + debug('Could not load dev recipes'); return false; } } diff --git a/src/lib/analytics.js b/src/lib/analytics.js index b13bf8faa..585cbcdba 100644 --- a/src/lib/analytics.js +++ b/src/lib/analytics.js @@ -2,6 +2,8 @@ import { remote } from 'electron'; import { GA_ID } from '../config'; // import { isDevMode } from '../environment'; +const debug = require('debug')('Analytics'); + const { app } = remote; /* eslint-disable */ @@ -28,13 +30,13 @@ ga('send', 'App'); export function gaPage(page) { ga('send', 'pageview', page); - console.debug('GA track page', page); + debug('GA track page', page); } export function gaEvent(category, action, label) { ga('send', 'event', category, action, label); - console.debug('GA track page', category, action); + debug('GA track page', category, action); } setTimeout(() => { diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js index 67fee1d50..a24308f6a 100644 --- a/src/stores/RecipesStore.js +++ b/src/stores/RecipesStore.js @@ -5,6 +5,8 @@ import CachedRequest from './lib/CachedRequest'; import Request from './lib/Request'; import { matchRoute } from '../helpers/routing-helpers'; +const debug = require('debug')('RecipeStore'); + export default class RecipesStore extends Store { @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all'); @observable installRecipeRequest = new Request(this.api.recipes, 'install'); @@ -34,7 +36,7 @@ export default class RecipesStore extends Store { return activeRecipe; } - console.warn('Recipe not installed'); + debug(`Recipe ${match.id} not installed`); } return null; @@ -54,10 +56,8 @@ export default class RecipesStore extends Store { // Actions @action async _install({ recipeId }) { - // console.log(this.installRecipeRequest._promise); const recipe = await this.installRecipeRequest.execute(recipeId)._promise; await this.allRecipesRequest.invalidate({ immediately: true })._promise; - // console.log(this.installRecipeRequest._promise); return recipe; } @@ -67,7 +67,7 @@ export default class RecipesStore extends Store { const recipes = {}; // Hackfix, reference this.all to fetch services - console.debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`); + debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`); recipeIds.forEach((r) => { const recipe = this.one(r); diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js index 4140ca362..595852583 100644 --- a/src/stores/RequestStore.js +++ b/src/stores/RequestStore.js @@ -2,6 +2,8 @@ import { action, computed, observable } from 'mobx'; import Store from './lib/Store'; +const debug = require('debug')('RequestsStore'); + export default class RequestStore extends Store { @observable userInfoRequest; @observable servicesRequest; @@ -52,7 +54,7 @@ export default class RequestStore extends Store { } this._autoRetry(); - console.debug(`Retry required requests delayed in ${(delay) / 1000}s`); + debug(`Retry required requests delayed in ${(delay) / 1000}s`); }, delay); } } diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index c38d0d9ee..0d9ff7f9b 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -10,6 +10,8 @@ import CachedRequest from './lib/CachedRequest'; import { matchRoute } from '../helpers/routing-helpers'; import { gaEvent } from '../lib/analytics'; +const debug = require('debug')('ServiceStore'); + export default class ServicesStore extends Store { @observable allServicesRequest = new CachedRequest(this.api.services, 'all'); @observable createServiceRequest = new Request(this.api.services, 'create'); @@ -103,7 +105,7 @@ export default class ServicesStore extends Store { return activeService; } - console.warn('Service not available'); + debug('Service not available'); } return null; @@ -117,10 +119,10 @@ export default class ServicesStore extends Store { const recipesStore = this.stores.recipes; if (recipesStore.isInstalled(recipeId)) { - console.debug('Recipe is installed'); + debug(`Recipe ${recipeId} is installed`); this._redirectToAddServiceRoute(recipeId); } else { - console.warn('Recipe is not installed'); + debug(`Recipe ${recipeId} is not installed`); // We access the RecipeStore action directly // returns Promise instead of action await this.stores.recipes._install({ recipeId }); @@ -487,7 +489,7 @@ export default class ServicesStore extends Store { if (service) { service.webview.openDevTools(); } else { - console.warn('No service is active'); + debug('No service is active'); } } diff --git a/yarn.lock b/yarn.lock index 317f7b220..540c4f8c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1643,6 +1643,12 @@ dateformat@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17" +debug-electron@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/debug-electron/-/debug-electron-0.0.4.tgz#9b035349ac8107b4e43da200d2339c4fd5b169e7" + dependencies: + debug "^2.4.1" + debug@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.4.tgz#5b9c256bd54b6ec02283176fa8a0ede6d154cbf8" @@ -1667,6 +1673,12 @@ debug@^2.1.3, debug@^2.2.0, debug@^2.5.1, debug@^2.6.1, debug@^2.6.3, debug@^2.6 dependencies: ms "2.0.0" +debug@^2.4.1: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + debug@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" -- cgit v1.2.3-70-g09d2