feat: support for js-ipfs and external nodes (#651)

* feat: support external and embedded nodes * feat: better logging and refactoring License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * refactor: async/await instead of promises License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * fix: correct logger path License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * fix: store migration from v1 to v2 License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * fix: enable web security License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * fix: settings page working again License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * fix: correct key sizes on welcome screen License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * fix: work with API License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com> * verify if folder is empty License: MIT Signed-off-by: Henrique Dias <hacdias@gmail.com>
ipfs · Aug 28, 2018 · c87cc17 · c87cc17
1 parent 0c427a2
commit c87cc17
Show file tree

Hide file tree

Showing 30 changed files with 786 additions and 727 deletions.
diff --git a/package.json b/package.json
@@ -8,12 +8,14 @@
   "dependencies": {
     "auto-launch": "^5.0.5",
     "bl": "^2.0.1",
-    "debug": "^3.1.0",
     "electron-compile": "^6.4.3",
     "electron-menubar": "^1.0.1",
     "electron-squirrel-startup": "^1.0.0",
+    "electron-store": "^2.0.0",
     "file-extension": "^4.0.5",
+    "fs-extra": "^7.0.0",
     "go-ipfs-dep": "^0.4.17",
+    "ipfs": "^0.31.2",
     "ipfs-stats": "^1.2.4",
     "ipfsd-ctl": "^0.39.0",
     "is-ipfs": "^0.4.2",
@@ -26,7 +28,8 @@
     "react": "^16.4.1",
     "react-dnd": "^5.0.0",
     "react-dnd-html5-backend": "^5.0.1",
-    "react-dom": "^16.4.1"
+    "react-dom": "^16.4.1",
+    "winston": "^3.0.0"
   },
   "devDependencies": {
     "babel-eslint": "^8.2.6",

diff --git a/src/components/Heartbeat.js b/src/components/Heartbeat.js
@@ -15,14 +15,14 @@ const blackLogo = resolve(join(__dirname, '../img/ipfs-logo-black.png'))
  *
  * @return {ReactElement}
  */
-export default function Heartbeat (props) {
-  if (props.dead) {
+export default function Heartbeat ({dead, className, ...props}) {
+  if (dead) {
     return (
-      <img src={`file://${blackLogo}`} />
+      <img src={`file://${blackLogo}`} {...props} />
     )
   } else {
     return (
-      <img src={`file://${icyLogo}`} className='heartbeat' />
+      <img src={`file://${icyLogo}`} className={`heartbeat ${className}`} {...props} />
     )
   }
 }
@@ -32,5 +32,6 @@ Heartbeat.propTypes = {
 }
 
 Heartbeat.defaultProps = {
-  dead: false
+  dead: false,
+  className: ''
 }
diff --git a/src/config.js b/src/config.js
diff --git a/src/controls/main/auto-launch.js b/src/controls/main/auto-launch.js
@@ -1,27 +1,28 @@
-const AutoLaunch = require('auto-launch')
+import AutoLaunch from 'auto-launch'
+import { store, logger } from '../../utils'
 
 const settingsOption = 'autoLaunch'
 const autoLauncher = new AutoLaunch({
   name: 'IPFS Desktop'
 })
 
-export default function (opts) {
-  let {debug, settingsStore} = opts
-
-  let activate = (value, oldValue) => {
+export default function () {
+  let activate = async (value, oldValue) => {
     if (value === oldValue) return
 
-    if (value === true) {
-      autoLauncher.enable()
-        .then(() => { debug('Launch on startup enabled') })
-        .catch(e => { debug(e.stack) })
-    } else {
-      autoLauncher.disable()
-        .then(() => { debug('Launch on startup disabled') })
-        .catch(e => { debug(e.stack) })
+    try {
+      if (value === true) {
+        await autoLauncher.enable()
+        logger.info('Launch on startup enabled')
+      } else {
+        await autoLauncher.disable()
+        logger.info('Launch on startup disabled')
+      }
+    } catch (e) {
+      logger.error(e.stack)
     }
   }
 
-  activate(settingsStore.get(settingsOption))
-  settingsStore.on(settingsOption, activate)
+  activate(store.get(settingsOption))
+  store.onDidChange(settingsOption, activate)
 }
diff --git a/src/controls/main/download-hash.js b/src/controls/main/download-hash.js
@@ -1,15 +1,16 @@
 import path from 'path'
-import fs from 'fs'
-import {clipboard, app, dialog, globalShortcut} from 'electron'
-import {validateIPFS} from '../utils'
+import fs from 'fs-extra'
+import { clipboard, app, dialog, globalShortcut } from 'electron'
+import { validateIPFS } from '../utils'
+import { store, logger } from '../../utils'
 
 const settingsOption = 'downloadHashShortcut'
 const shortcut = 'CommandOrControl+Alt+D'
 
 function selectDirectory (opts) {
-  const {menubar} = opts
+  const { menubar } = opts
 
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     dialog.showOpenDialog(menubar.window, {
       title: 'Select a directory',
       defaultPath: app.getPath('downloads'),
@@ -27,28 +28,26 @@ function selectDirectory (opts) {
   })
 }
 
-function saveFile (opts, dir, file) {
-  const {debug} = opts
+async function saveFile (dir, file) {
   const location = path.join(dir, file.path)
 
-  if (fs.existsSync(location)) {
-    // Ignore the hash itself.
+  if (await fs.pathExists(location)) {
+    // ignore the hash itself
     return
   }
 
-  fs.writeFile(location, file.content, (err) => {
-    if (err) {
-      debug(err.stack)
-    } else {
-      debug(`File '${file.path}' downloaded to ${location}.`)
-    }
-  })
+  try {
+    await fs.writeFile(location, file.content)
+    logger.info(`File '${file.path}' downloaded to ${location}.`)
+  } catch (e) {
+    logger.error(e.stack)
+  }
 }
 
 function handler (opts) {
-  const {debug, ipfs} = opts
+  const { ipfs } = opts
 
-  return () => {
+  return async () => {
     const text = clipboard.readText().trim()
 
     if (!ipfs() || !text) {
@@ -63,49 +62,45 @@ function handler (opts) {
       return
     }
 
-    ipfs().get(text)
-      .then((files) => {
-        debug(`Hash ${text} downloaded.`)
-        selectDirectory(opts)
-          .then((dir) => {
-            if (!dir) {
-              debug(`Dropping hash ${text}: user didn't choose a path.`)
-              return
-            }
-
-            if (files.length > 1) {
-              fs.mkdirSync(path.join(dir, text))
-            }
-
-            files.forEach(file => { saveFile(opts, dir, file) })
-          })
-          .catch(e => debug(e.stack))
-      })
-      .catch(e => {
-        debug(e.stack)
-        dialog.showErrorBox(
-          'Error while downloading',
-          'Some error happened while getting the hash. Please check the logs.'
-        )
-      })
+    try {
+      const files = await ipfs().get(text)
+      logger.info(`Hash ${text} downloaded.`)
+
+      const dir = await selectDirectory(opts)
+
+      if (!dir) {
+        logger.info(`Dropping hash ${text}: user didn't choose a path.`)
+        return
+      }
+
+      if (files.length > 1) {
+        fs.mkdirSync(path.join(dir, text))
+      }
+
+      files.forEach(file => { saveFile(dir, file) })
+    } catch (e) {
+      logger.error(e.stack)
+      dialog.showErrorBox(
+        'Error while downloading',
+        'Some error happened while getting the hash. Please check the logs.'
+      )
+    }
   }
 }
 
 export default function (opts) {
-  let {debug, settingsStore} = opts
-
   let activate = (value, oldValue) => {
     if (value === oldValue) return
 
     if (value === true) {
       globalShortcut.register(shortcut, handler(opts))
-      debug('Hash download shortcut enabled')
+      logger.info('Hash download shortcut enabled')
     } else {
       globalShortcut.unregister(shortcut)
-      debug('Hash download shortcut disabled')
+      logger.info('Hash download shortcut disabled')
     }
   }
 
-  activate(settingsStore.get(settingsOption))
-  settingsStore.on(settingsOption, activate)
+  activate(store.get(settingsOption))
+  store.onDidChange(settingsOption, activate)
 }