update to work with [email protected]

storj-archived · Apr 25, 2016 · 5f6d685 · 5f6d685
1 parent a673c08
commit 5f6d685
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 36 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -23,7 +23,7 @@
   "undef": true,
   "unused": true,
   "maxparams": 4,
-  "maxstatements": 20,
+  "maxstatements": 22,
   "maxcomplexity": 6,
   "maxdepth": 3,
   "maxlen": 80,

diff --git a/app/client.js b/app/client.js
@@ -21,10 +21,11 @@ var Updater = require('./lib/updater');
 var UserData = require('./lib/userdata');
 var Tab = require('./lib/tab');
 var diskspace = require('./lib/diskspace');
-var FarmerFactory = require('storj').abstract.FarmerFactory;
+var storj = require('storj');
 var request = require('request');
 var SpeedTest = require('myspeed').Client;
 var userdata = new UserData(app.getPath('userData'));
+var Logger = require('kad-logger-json');
 
 // bootstrap helpers
 helpers.ExternalLinkListener().bind(document);
@@ -271,47 +272,60 @@ var main = new Vue({
 
       tab.telemetry = { enabled: self.userdata.appSettings.reportTelemetry };
 
-      FarmerFactory().create(tab, function(err, farmer) {
-        if (err) {
-          return window.alert(err.message);
-        }
+      var logger = new Logger();
+      var reporter = new storj.TelemetryReporter(
+        'http://status.storj.io',
+        storj.KeyPair(tab.key)
+      );
+      var farmerconf = {
+        keypair: storj.KeyPair(tab.key),
+        payment: tab.address,
+        storage: tab.storage,
+        address: '127.0.0.1',
+        port: 0,
+        seeds: [
+          'storj://api.storj.io:8443/593844dc7f0076a1aeda9a6b9788af17e67c1052'
+        ],
+        logger: logger,
+        tunport: 0
+      };
+      var farmer = new storj.FarmerInterface(farmerconf);
 
-        tab.farmer = function() {
-          return farmer.node;
-        };
+      tab.farmer = function() {
+        return farmer;
+      };
 
-        tab.reporter = function() {
-          return farmer.reporter;
-        };
+      tab.reporter = function() {
+        return reporter;
+      };
 
-        farmer.logger.on('log', function(data) {
-          tab.logs.append(
-            '<div><span class="' + data.type + '">{' + data.type + '}</span> ' +
-            '<span class="ts">[' + data.timestamp + ']</span></div>' +
-            '<div><em>' + data.message + '</em></div>'
-          );
-        });
+      logger.on('log', function(data) {
+        tab.logs.append(
+          '<div><span class="' + data.type + '">{' + data.type + '}</span> ' +
+          '<span class="ts">[' + data.timestamp + ']</span></div>' +
+          '<div><em>' + data.message + '</em></div>'
+        );
+      });
 
-        tab.wasRunning = true;
-        ipc.send('appSettingsChanged', JSON.stringify(userdata.toObject()));
+      tab.wasRunning = true;
+      ipc.send('appSettingsChanged', JSON.stringify(userdata.toObject()));
 
-        if (self.userdata.appSettings.reportTelemetry) {
-          self.startReportingTelemetry(tab);
+      if (self.userdata.appSettings.reportTelemetry) {
+        self.startReportingTelemetry(tab);
+      }
+
+      userdata.saveConfig(function(err) {
+        if (err) {
+          self.transitioning = false;
+          return window.alert(err.message);
         }
 
-        userdata.saveConfig(function(err) {
+        farmer.join(function(err) {
+          self.transitioning = false;
+
           if (err) {
-            self.transitioning = false;
             return window.alert(err.message);
           }
-
-          farmer.node.join(function(err) {
-            self.transitioning = false;
-
-            if (err) {
-              return window.alert(err.message);
-            }
-          });
         });
       });
     },

diff --git a/app/package.json b/app/package.json
@@ -20,12 +20,13 @@
     "fs-extra": "^0.24.0",
     "jquery": "^2.1.4",
     "jsen": "^0.6.1",
+    "kad-logger-json": "^0.1.1",
     "merge": "^1.2.0",
     "mkdirp": "^0.5.1",
+    "myspeed": "^1.0.1",
     "request": "^2.63.0",
     "semver": "^5.1.0",
-    "myspeed": "^1.0.1",
-    "storj": "^0.5.2",
+    "storj": "^0.6.0",
     "untildify": "^2.1.0",
     "vue": "^1.0.10",
     "winreg": "0.0.15"

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "rcedit": "^0.3.0"
   },
   "scripts": {
-    "postinstall": "node ./tasks/app_npm_install && flatten-packages app",
+    "postinstall": "node ./tasks/app_npm_install",
     "app-install": "node ./tasks/app_npm_install",
     "build": "./node_modules/.bin/gulp build",
     "release": "./node_modules/.bin/gulp release --env=production",