library versions, error handling, copy tweaks

ipfs · Jun 24, 2015 · bc6feda · jbenet · Jun 24, 2015 · jbenet
1 parent afc5e41
commit bc6feda
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 75,136 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 debug.log
 pkg
 node_modules/
+build
diff --git a/build.sh b/build.sh
@@ -0,0 +1,3 @@
+mkdir build 2> /dev/null
+browserify js/menu.jsx > build/menu.js
+browserify js/initialize.jsx > build/initialize.js
diff --git a/html/initialize.html b/html/initialize.html
@@ -4,7 +4,7 @@
     <meta charset='utf-8'/>
     <link rel='stylesheet' href='../node_modules/bootstrap/dist/css/bootstrap.css'/>
     <link rel='stylesheet' href='../css/common.css'/>
-    <script src="../js/initialize.js"></script>
+    <script src="../build/initialize.js"></script>
   </head>
   <body>
     <div id='header' class='row'>

diff --git a/html/menu.html b/html/menu.html
@@ -5,7 +5,7 @@
     <link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.css"/>
     <link rel="stylesheet" href="../node_modules/bootstrap-toggle/css/bootstrap2-toggle.css"/>
     <link rel="stylesheet" href="../css/menu.css"/>
-    <script src="../js/menu.js"></script>
+    <script src="../build/menu.js"></script>
   </head>
   <body>
     <div id="menu-app"/>

diff --git a/index.js b/index.js
@@ -63,60 +63,6 @@ var initialize = function (path, node) {
   })
 }
 
-var startTray = function (node) {
-  var poll
-  var statsCache = {}
-
-  ipc.on('request-state', function (event) {
-    ipfsd.version(function (err, res) {
-      if (err) throw err
-      ipc.emit('version', res)
-    })
-
-    if (node.initialized) {
-      ipc.emit('node-status', 'stopped')
-    }
-  })
-
-  ipc.on('start-daemon', function () {
-    ipc.emit('node-status', 'starting')
-    node.startDaemon(function (err, ipfs) {
-      if (err) throw err
-      ipc.emit('node-status', 'running')
-      poll = setInterval(function () { pollStats(ipfs) }, 500)
-
-      Ipfs = ipfs
-    })
-  })
-
-  ipc.on('stop-daemon', function () {
-    ipc.emit('node-status', 'stopping')
-    if (poll) {
-      delete statsCache.peers
-      ipc.emit('stats', statsCache)
-      clearInterval(poll)
-      poll = null
-    }
-
-    node.stopDaemon(function (err) {
-      if (err) throw err
-      ipc.emit('node-status', 'stopped')
-      ipc.emit('stats', statsCache)
-    })
-  })
-
-  ipc.on('open-console', openConsole)
-  ipc.on('open-browser', openBrowser)
-
-  var pollStats = function (ipfs) {
-    ipc.emit('stats', statsCache)
-    ipfs.swarm.peers(function (err, res) {
-      if (err) throw err
-      statsCache.peers = res.Strings.length
-    })
-  }
-}
-
 // main entry point
 ipfsd.local(function (err, node) {
   if (err) error(err)
@@ -153,6 +99,65 @@ ipfsd.local(function (err, node) {
       mb.window.setSize(MENU_WIDTH, height)
     })
   })
+
+  var startTray = function (node) {
+    var poll
+    var statsCache = {}
+
+    ipc.on('request-state', function (event) {
+      ipfsd.version(function (err, res) {
+        if (err) throw err
+        ipc.emit('version', res)
+      })
+
+      if (node.initialized) {
+        ipc.emit('node-status', 'stopped')
+      }
+    })
+
+    ipc.on('start-daemon', function () {
+      ipc.emit('node-status', 'starting')
+      node.startDaemon(function (err, ipfs) {
+        if (err) throw err
+        ipc.emit('node-status', 'running')
+
+        poll = setInterval(function () {
+          if (mb.window.isVisible()) {
+            pollStats(ipfs)
+          }
+        }, 500)
+
+        Ipfs = ipfs
+      })
+    })
+
+    ipc.on('stop-daemon', function () {
+      ipc.emit('node-status', 'stopping')
+      if (poll) {
+        delete statsCache.peers
+        ipc.emit('stats', statsCache)
+        clearInterval(poll)
+        poll = null
+      }
+
+      node.stopDaemon(function (err) {
+        if (err) throw err
+        ipc.emit('node-status', 'stopped')
+        ipc.emit('stats', statsCache)
+      })
+    })
+
+    ipc.on('open-console', openConsole)
+    ipc.on('open-browser', openBrowser)
+
+    var pollStats = function (ipfs) {
+      ipc.emit('stats', statsCache)
+      ipfs.swarm.peers(function (err, res) {
+        if (err) throw err
+        statsCache.peers = res.Strings.length
+      })
+    }
+  }
 })
 
 var apiAddrToUrl = function (apiAddr) {
@@ -161,26 +166,37 @@ var apiAddrToUrl = function (apiAddr) {
   return url
 }
 
-var openConsole = function () {
+var openConsole = function (cb) {
   if (Ipfs) {
     Ipfs.config.get('Addresses.API', function (err, res) {
+      if (err && cb) return cb(err)
       if (err) throw err
 
       mainWindow = new BrowserWindow({icon: LOGO, width: 800, height: 600})
       mainWindow.on('closed', function () {
         mainWindow = null
       })
-
       mainWindow.loadUrl(apiAddrToUrl(res.Value))
+      cb && cb()
     })
+  } else {
+    var err = new Error('Cannot open console, IPFS daemon not running')
+    if (err && cb) return cb(err)
+    if (err) throw err
   }
 }
 
-var openBrowser = function () {
+var openBrowser = function (cb) {
   if (Ipfs) {
     Ipfs.config.get('Addresses.API', function (err, res) {
+      if (err && cb) return cb(err)
       if (err) throw err
       open(apiAddrToUrl(res.Value))
+      cb && cb()
     })
+  } else {
+    var err = new Error('Cannot open browser, IPFS daemon not running')
+    if (err && cb) return cb(err)
+    if (err) throw err
   }
 }