Merge pull request #11 from vijayee/master

Various Bug Fixes

Author: vijayee

Dockerfile

@@ -1,16 +1,16 @@
 FROM ubuntu:bionic
-COPY ["./dist/OFF System_0.0.2_amd64.deb", "./"]
+COPY ["./dist/OFF_System_0.1.0_linux_amd64.deb", "./"]
 
 EXPOSE 23402
 EXPOSE 8200
 ENV LD_LIBRARY_PATH="/usr/local/lib"
 RUN apt-get update
 RUN apt install libasound2 -y
-RUN apt install "./OFF System_0.0.2_amd64.deb" -f -y
+RUN apt install "./OFF_System_0.1.0_linux_amd64.deb" -f -y
 RUN apt-get update -y && \
     apt-get install -y libgtk2.0-0 && \
     apt-get install -y libnotify-dev && \
     apt-get install -y libgconf-2-4 && \
     apt-get install -y libnss3
 ENV ELECTRON_RUN_AS_NODE="true"
-ENTRYPOINT [ "offs", "/opt/OFF System/resources/app.asar/src/index.js"]
+ENTRYPOINT [ "offs", "/opt/offs/resources/app.asar/src/index.js", "--path", "/offs"]

package-lock.json

@@ -16,8 +16,8 @@
     "build-win": "npm run compile-vue && electron-builder --win",
     "build-mac": "npm run compile-vue && electron-builder --mac",
     "build-docker": "npm run build && sudo docker build -t offs .",
-    "publish": "build -p always",
-    "docker": "sudo docker run -a STDERR -a STDOUT -p 23402:23402  -p 8200:8200 --name offsystem offs "
+    "publish": "build --win --linux -p always",
+    "docker": "sudo docker run -a STDERR -a STDOUT -p 23402:23402  -p 8200:8200 --name offsystem -v offs:/offs offs"
   },
   "author": "Prometheus <[email protected]>",
   "license": "GPL-3.0",
@@ -86,6 +86,9 @@
     },
     "appImage": {
       "artifactName": "OFF_System_${version}_linux_${arch}.AppImage"
+    },
+    "deb": {
+      "artifactName": "OFF_System_${version}_linux_${arch}.deb"
     }
   },
   "dependencies": {
@@ -114,9 +117,11 @@
     "nat-upnp": "1.1.1",
     "network": "0.4.1",
     "node-forge": "0.7.6",
+    "pretty-bytes": "^5.1.0",
     "protobufjs": "5.0.1",
     "protocol-buffers": "3.1.6",
     "streamifier": "0.1.1",
+    "streamspeed": "^1.1.1",
     "through2": "2.0.3",
     "to-array-buffer": "2.1.0",
     "urldecode": "1.0.1",

package.json

@@ -28,7 +28,7 @@ if (cluster.isMaster) {
           pool.delete(worker.id)
           let cb = _callbacks.get(this)
           if (cb) {
-            return cb(new Error('Worker Exited Unexpectedly'))
+            cb(new Error('Worker Exited Unexpectedly'))
           }
           return spawnWorker()
         })
@@ -78,35 +78,47 @@ if (cluster.isMaster) {
       }
     }
     content (temps, cb) {
-      let worker = this._freeWorker()
-      if (worker) {
-        _callbacks.set(worker, cb)
-        worker.send({type: type.content, temps})
-      } else {
-        let queue = _queue.get(this)
-        queue.unshift({type: type.content, temps, cb: cb})
+      try {
+        let worker = this._freeWorker()
+        if (worker) {
+          _callbacks.set(worker, cb)
+          worker.send({ type: type.content, temps })
+        } else {
+          let queue = _queue.get(this)
+          queue.unshift({ type: type.content, temps, cb: cb })
+        }
+      } catch (err) {
+        return cb(err)
       }
     }
 
-    contentFilter (temps, cb){
-      let worker = this._freeWorker()
-      if (worker) {
-        _callbacks.set(worker, cb)
-        worker.send({type: type.contentFilter, temps})
-      } else {
-        let queue = _queue.get(this)
-        queue.unshift({type: type.contentFilter, temps, cb: cb})
+    contentFilter (temps, cb) {
+      try {
+        let worker = this._freeWorker()
+        if (worker) {
+          _callbacks.set(worker, cb)
+          worker.send({ type: type.contentFilter, temps })
+        } else {
+          let queue = _queue.get(this)
+          queue.unshift({ type: type.contentFilter, temps, cb: cb })
+        }
+      } catch (err) {
+        return cb(err)
       }
     }
 
     closestBlock (temps, key, filter, cb) {
-      let worker = this._freeWorker()
-      if (worker) {
-        _callbacks.set(worker, cb)
-        worker.send({type: type.closestBlock, temps, key, filter})
-      } else {
-        let queue = _queue.get(this)
-        queue.unshift({type: type.closestBlock, temps, key, filter, cb: cb})
+      try {
+        let worker = this._freeWorker()
+        if (worker) {
+          _callbacks.set(worker, cb)
+          worker.send({ type: type.closestBlock, temps, key, filter })
+        } else {
+          let queue = _queue.get(this)
+          queue.unshift({ type: type.closestBlock, temps, key, filter, cb: cb })
+        }
+      } catch (err) {
+        return cb(err)
       }
     }
     _free(threadId) {
@@ -116,9 +128,14 @@ if (cluster.isMaster) {
         if (next) {
           let pool = _pool.get(this)
           let worker = pool.get(threadId)
-          _callbacks.set(worker, next.cb)
+          let cb = next.cb
+          _callbacks.set(worker, cb)
           delete next.cb
-          worker.send({...next})
+          try {
+            worker.send({ ...next })
+          } catch (err) {
+            return cb(err)
+          }
         }
       })
     }

src/block-cache-cluster.js

@@ -51,6 +51,7 @@ module.exports = class BlockRouter extends EventEmitter {
     _scheduler.set(this, scheduler)
 
     scheduler.on('error', (err) => this.emit('error', err))
+    scheduler.on('locator', () => this.emit('locator'))
     rpc.on('error', (err) => this.emit('error', err))
     bc.on('block', (block)=> {
       rpc.store(block.hash, config.block, block.data, () => {})
@@ -310,47 +311,51 @@ module.exports = class BlockRouter extends EventEmitter {
   }
 
   bootstrap (cb) {
-    let bootstrap = config.bootstrap.map((peer) => Peer.fromLocator(peer)).filter((peer) => !peer.isEqual(Peer.self))
-    let connect = () => {
-      let i = -1
-      let next = (err) => {
-        if (err) {
-          this.emit('error', err)
-        }
-        i++
-        if (i < bootstrap.length) {
-          let peer = bootstrap[ i ]
-          this.connect(peer, next)
-        } else { //Fill routing table with the closet nodes to themselves
-          let rpc = _rpc.get(this)
-          rpc.findNode(Peer.self.id, cb)
+    try {
+      let bootstrap = config.bootstrap.map((peer) => Peer.fromLocator(peer)).filter((peer) => !peer.isEqual(Peer.self))
+      let connect = () => {
+        let i = -1
+        let next = (err) => {
+          if (err) {
+            this.emit('error', err)
+          }
+          i++
+          if (i < bootstrap.length) {
+            let peer = bootstrap[ i ]
+            this.connect(peer, next)
+          } else { //Fill routing table with the closet nodes to themselves
+            let rpc = _rpc.get(this)
+            rpc.findNode(Peer.self.id, cb)
+          }
         }
+        next()
       }
-      next()
-    }
-    // If this option is selected  then Bootstrap to whomever we were last online with
-    if (config.lastKnownPeers) {
-      let path = _path.get(this)
-      let fd = pth.join(path, '.bucket')
-      fs.readFile(fd, (err, bucketFile) => {
-        if (err) {
-          this.emit(err)
-          return connect()
-        }
-        if (bucketFile) {
-          let peers = cbor.decode(toAb(bucketFile))
-          for (let pier of peers) {
-            let peer = Peer.fromLocator(pier)
-            let found = bootstrap.find((boot) => peer.isEqual(boot))
-            if (!found) {
-              bootstrap.push(peer)
+      // If this option is selected  then Bootstrap to whomever we were last online with
+      if (config.lastKnownPeers) {
+        let path = _path.get(this)
+        let fd = pth.join(path, '.bucket')
+        fs.readFile(fd, (err, bucketFile) => {
+          if (err) {
+            this.emit(err)
+            return connect()
+          }
+          if (bucketFile) {
+            let peers = cbor.decode(toAb(bucketFile))
+            for (let pier of peers) {
+              let peer = Peer.fromLocator(pier)
+              let found = bootstrap.find((boot) => peer.isEqual(boot))
+              if (!found) {
+                bootstrap.push(peer)
+              }
             }
           }
-        }
+          return connect()
+        })
+      } else {
         return connect()
-      })
-    } else {
-      return connect()
+      }
+    } catch(err) {
+      return cb(err)
     }
   }
 

src/block-router.js

@@ -8,6 +8,8 @@ module.exports = new (class Command {
     cmd.name('offs')
     cmd.version(pkg.version, '-v, --version')
     cmd.option('-t, --terminal', 'Run in Terminal Only (without GUI)')
+    cmd.option('-p, --path [dir]', 'Initial path for the application')
+
   }
   parse() {
     cmd.parse(process.argv)

src/command.js

@@ -46,7 +46,7 @@ let defaults = {
   bucketTimeout: 60 * 1000 * 5,
   socketTimeout: 120 * 1000,
   bootstrap: [
-    '5LTX64UZmqxAckP99fRNKutPQCJabbB1xMa1vuCG1Z58SJdLkGa9NkngQNSihHhBPA25evTSSMzqrPJovRLkEykSf7orstw7TCUh1DABKyn3iozxBsL3yKBq7EWz9pHdAE9Fd'
+    'L8t3oLLfnGZPgkkiAW2FwzHqeWt4pS9amGZQNpPKQgkNrF3JTGxptXuQwc8W7AdaRB34k2afQszr3LQqfUP6hzXgPGu5Rnw28sDwcA3GRrsnqbGYdpLETkSVBNXK1cJwRFRqfD'
   ]
 }
 let _blockPath = new WeakMap()
@@ -190,7 +190,7 @@ class Config {
     _internalIP.set(this, defaults.internalIP)
     _bootstrap.set(this, defaults.bootstrap.slice(0))
     _bucketTimeout.set(this, defaults.bucketTimeout)
-    _bucketTimeout.set(this, defaults.socketTimeout)
+    _socketTimeout.set(this, defaults.socketTimeout)
   }
 
   get blockPath () {
@@ -225,7 +225,7 @@ class Config {
     if (!Number.isInteger(+value)) {
       throw new TypeError("Invalid Block Cache Size")
     }
-    if (value < 300) {
+    if (value < 300 * mb) {
       throw new TypeError("Block Cache Size Is Too Small")
     }
     if (value > (549755813 * mb)) {
@@ -243,7 +243,7 @@ class Config {
     if (!Number.isInteger(+value)) {
       throw new TypeError("Invalid Mini Block Cache Size")
     }
-    if (value < 300) {
+    if (value < 300 * mb) {
       throw new TypeError("Mini Block Cache Size Is Too Small")
     }
     if (value > (42949672 * mb)) {
@@ -261,7 +261,7 @@ class Config {
     if (!Number.isInteger(+value)) {
       throw new TypeError("Invalid Nano Block Cache Size")
     }
-    if (value < 300) {
+    if (value < 300 * mb) {
       throw new TypeError("Nano Block Cache Size Is Too Small")
     }
     if (value > (584115 * mb)) {
@@ -440,7 +440,6 @@ class Config {
   }
   get socketTimeout () {
     return _socketTimeout.get(this)
-    this.save()
   }
   set socketTimeout (value) {
     _socketTimeout.set(this, +value)