Windows Error

.gitignore

@@ -11,4 +11,7 @@
 js-offs-linux-x64/
 js-offs-win32-x64/
 js-offs-darwin-x64/
+js-offs-win32-x64.zip
+js-offs-win32-x64.zip
+js-offs-linux-x64.zip
 

package.json

@@ -11,11 +11,11 @@
     "start": "npm run compile-vue && ./node_modules/.bin/electron .",
     "rebuild": "./node_modules/.bin/electron-rebuild",
     "build-native": "./node_modules/.bin/electron-packager ./",
-    "build-linux-x64": "./node_modules/.bin/electron-packager ./ --platform=linux --arch=x64",
-    "build-linux-ia36": "./node_modules/.bin/electron-packager ./ --platform=linux --arch=ia36",
-    "build-windows-x64": "./node_modules/.bin/electron-packager ./ --platform=win32 --arch=x64",
-    "build-windows-ia36": "./node_modules/.bin/electron-packager ./ --platform=win32 --arch=ia36",
-    "build-darwin-x64": "./node_modules/.bin/electron-packager ./ --platform=darwin --arch=x64"
+    "build-linux-x64": "./node_modules/.bin/electron-packager ./ --platform=linux --arch=x64 --icon=src/electron/images/off-logo.png --asar=true --overwrite && zip -FS -r js-offs-linux-x64.zip js-offs-linux-x64",
+    "build-linux-ia36": "./node_modules/.bin/electron-packager ./ --platform=linux --arch=ia36 --icon=src/electron/images/off-logo.png --asar=true --overwrite && zip -FS -r js-offs-linux-ia36.zip js-offs-linux-ia36",
+    "build-windows-x64": "./node_modules/.bin/electron-packager ./ --platform=win32 --arch=x64 --icon=src/electron/images/off-logo.ico --asar=true --overwrite && zip -FS -r js-offs-win32-x64.zip js-offs-win32-x64",
+    "build-windows-ia36": "./node_modules/.bin/electron-packager ./ --platform=win32 --arch=ia36 --icon=src/electron/images/off-logo.ico --asar=true --overwrite && zip -FS -r js-offs-win32-ia36.zip js-offs-win32-x64",
+    "build-darwin-x64": "./node_modules/.bin/electron-packager ./ --platform=darwin --arch=x64 --icon=src/electron/images/off-logo.icns --asar=true --overwrite && zip -FS -r js-offs-darwin-x64.zip js-offs-darwin-x64"
   },
   "author": "Victor Morrow <vijayee.kulkaa@hushmail.com>",
   "license": "GPL-3.0",

src/block-cache.js

@@ -7,6 +7,8 @@ const Block = require('./block')
 const util = require('./utility')
 const fs = require('fs')
 const getSize = require('get-folder-size')
+const bs58 = require('bs58')
+const hamming = require('hamming-distance')
 const CuckooFilter = require('cuckoo-filter').CuckooFilter
 let _cacheInterface = new WeakMap()
 let _path = new WeakMap()
@@ -103,9 +105,6 @@ module.exports =
     }
 
     load (keys) {
-      keys = keys.filter((key)=> {
-        return !this.contains(key)
-      })
       let cacheInterface = _cacheInterface.get(this)
       return cacheInterface.load(keys)
     }

src/block-router.js

@@ -160,7 +160,7 @@ module.exports = class BlockRouter extends EventEmitter {
         return cb(err, block.data)
       })
     }
-    rpc.closestBlock = (number, filter, hash, type, cb) => {
+    rpc.closestBlock = (hash, filter, type, cb) => {
       let bc
       switch (type) {
         case 1:
@@ -174,7 +174,7 @@ module.exports = class BlockRouter extends EventEmitter {
           break;
       }
       let key = bs58.encode(hash)
-      bc.closestBlock(number, key, filter, cb)
+      bc.closestBlock(key, filter, cb)
     }
     rpc.containsValue = (hash, type, cb)=> {
       let bc

src/bucket.js

@@ -107,10 +107,16 @@ module.exports = class Bucket extends EventEmitter {
     if (!(peer instanceof Peer)) {
       throw new Error('Invalid Peer')
     }
+    if (!(peer.id)) {
+      throw new Error('Invalid Peer')
+    }
+    const nodeId = _nodeId.get(this)
+    if (nodeId.equals(peer.id)) {
+      return
+    }
     if (!index) {
       index = 0
     }
-
     if (isNaN(index)) {
       throw new Error('Invalid index')
     }

src/config.js

@@ -35,7 +35,7 @@ let defaults = {
   redundancy: .30, //30% network redundancy target
   batchConcurrency: 10,
   bootstrap: [
-    {id: 'LeW7AX2UhTypMKywe7EHiiAGLnd1tTeqGJ1b7VpLWMr', ip: '73.135.22.132', port: 8200 }
+    {id: '8fHecNZCiTxavnfnskySbeAYCd1bcv1SAVyi1mcZqurH', ip: '73.135.22.132', port: 8200 }
   ]
 }
 let _blockPath = new WeakMap()

src/electron/views/configuration/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" style="overflow: hidden !important;">
 <head>
   <meta charset="UTF-8">
   <title>Off System: Configuration</title>
@@ -10,7 +10,7 @@
   <link rel="image_src" href="/images/off-logo.gif"/>
 </head>
 
-<body>
+<body style="overflow: hidden !important;">
   <div id="app"></div>
   <script>
     const ipcRenderer = require('electron').ipcRenderer

src/electron/views/connect/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" style="overflow: hidden !important;">
 <head>
   <meta charset="UTF-8">
   <title>Off System: Connect to a Peer</title>
@@ -13,7 +13,7 @@
   const Connector = require('../../../connector').rendererConnector
 </script>
 
-<body style="overflow:hidden;">
+<body style="overflow: hidden !important;">
   <div id="app" style="overflow:hidden;"></div>
   <script src="index.js"></script>
 </body>

src/index.js

@@ -49,7 +49,16 @@ function createWindow () {
   node.once('ready', () => {
     let importWin
     let createImportWin = () => {
-      importWin = new BrowserWindow({ width: 530, height: 304, icon: icon, autoHideMenuBar:true, resizable: false})
+      let width
+      let height
+      if (/^win/.test(process.platform)) {
+        width = 530
+        height = 380
+      } else {
+        width = 530
+        height = 304
+      }
+      importWin = new BrowserWindow({ width, height, icon: icon, autoHideMenuBar:true, resizable: false})
       importWin.on('close', (e) => {
         e.preventDefault()
         importWin.hide()
@@ -91,7 +100,16 @@ function createWindow () {
     let connectWin
     let connector
     let createConnectWin = () => {
-      connectWin = new BrowserWindow({ width: 800, height: 126, icon: icon, autoHideMenuBar:true, resizable: false})
+      let width
+      let height
+      if (/^win/.test(process.platform)) {
+        width = 800
+        height = 186
+      } else {
+        width = 800
+        height = 126
+      }
+      connectWin = new BrowserWindow({ width, height, icon: icon, autoHideMenuBar:true, resizable: false})
       connectWin.on('close', (e) => {
         e.preventDefault()
         connectWin.hide()
@@ -135,7 +153,7 @@ function createWindow () {
         configurationWin.hide()
       })
       configurationWin.loadURL(`file://${path.join(__dirname, 'electron', 'views', 'configuration', 'index.html')}`)
-      //configurationWin.webContents.openDevTools({})
+     // configurationWin.webContents.openDevTools({})
       let setHandler = async (payload) => {
         config[payload.key] = payload.value
       }

src/peer.js

@@ -3,6 +3,7 @@ const isIP = require('is-ip')
 const bs58 = require('bs58')
 const fs = require('fs')
 const path = require('path')
+const net = require('net')
 let _port = new WeakMap()
 let _ip = new WeakMap()
 let _id = new WeakMap()
@@ -13,7 +14,7 @@ module.exports = class Peer {
     if (!Buffer.isBuffer(id)) {
       throw new Error('Id is not a buffer')
     }
-    if (!isIP(ip)) {
+    if (!net.isIP(ip)) {
       throw new Error('Ip is not a valid address')
     }
     if (isNaN(port)) {

src/readable-off-stream.js

@@ -92,10 +92,13 @@ module.exports = class ReadableOffStream extends Readable {
           let doNext = () => {
             bc.get(key, next)
           }
-          bc.contains(key, (contains) => {
+          let testContents = (contains) => {
             if (!contains) {
               if (flightBox && flightBox.filter.contains(key)) {
-                flightBox.emitter.on(key, doNext)
+                flightBox.emitter.on(key, () => {
+                  console.log(key)
+                  bc.contains(key, testContents)
+                })
               } else {
                 let flightBox = bc.load([ key ])
                 flightBox.emitter.once(key, doNext)
@@ -107,7 +110,8 @@ module.exports = class ReadableOffStream extends Readable {
             } else {
               doNext()
             }
-          })
+          }
+          bc.contains(key, testContents)
         } else {
           return yieldBlock()
         }

src/rpc.js

@@ -137,7 +137,7 @@ module.exports = class RPC extends EventEmitter {
       responsepb.comType = Direction.Response
       responsepb.from = peer.toJSON()
       let type = randompb.type
-      rpcInterface.closestBlock(Cuckoo.fromCBOR(randompb.filter), pb.from.id, randompb.type, (err, block)=> {
+      rpcInterface.closestBlock(pb.from.id, Cuckoo.fromCBOR(randompb.filter), randompb.type, (err, block)=> {
         if (err) {
           responsepb.status = Status.Failure
           let response = new RPCProto.RPC(responsepb).encode().toBuffer()