Merge pull request #35 from bookchin/master

v2.1.1 (Telemetry Reporting)

lib/api.js

@@ -223,7 +223,8 @@ class RPC {
         id: nodeId,
         config: share.config,
         state: share.readyState,
-        meta: share.meta
+        meta: share.meta,
+        path: share.path
       });
     });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "storjshare-daemon",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "daemon + process manager for sharing space on the storj network",
   "main": "index.js",
   "bin": {
@@ -67,7 +67,8 @@
     "pretty-ms": "^2.1.0",
     "rc": "^1.1.6",
     "readable-stream": "^2.2.2",
-    "storj-lib": "^6.0.12",
+    "storj-lib": "^6.0.14",
+    "storj-telemetry-reporter": "^5.0.0",
     "strip-json-comments": "^2.0.1",
     "tail": "^1.2.1"
   },

script/farmer.js

@@ -5,6 +5,7 @@
 const utils = require('../lib/utils');
 const storj = require('storj-lib');
 const Logger = require('kad-logger-json');
+const Telemetry = require('storj-telemetry-reporter');
 const config = JSON.parse(JSON.stringify(require('../lib/config/farmer')));
 const bytes = require('bytes');
 
@@ -38,7 +39,7 @@ farmer.join((err) => {
 
 function sendFarmerState() {
   farmerState.totalPeers = farmer.router.length;
-  process.send(farmerState)
+  process.send(farmerState);
 }
 
 function updatePercentUsed() {
@@ -50,7 +51,30 @@ function updatePercentUsed() {
   });
 }
 
+function sendTelemetryReport() {
+  let telemetryServer = 'https://status.storj.io';
+  let telemetry = new Telemetry(telemetryServer, config.keyPair);
+  let report = {
+    storageAllocated: spaceAllocation,
+    storageUsed: bytes.parse(farmerState.spaceUsed),
+    contactNodeId: config.keyPair.getNodeID(),
+    paymentAddress: config.paymentAddress
+  };
+  telemetry.send(report, (err) => {
+    if (err) {
+      return config.logger.warn('telemetry report rejected, reason: %s',
+                                err.message);
+    }
+    config.logger.info('telemetry report delivered to %s: %j', telemetryServer,
+                       report);
+  });
+}
+
 updatePercentUsed();
 sendFarmerState();
 setInterval(sendFarmerState, 10 * 1000); // Update state every 10 secs
 setInterval(updatePercentUsed, 10 * 60 * 1000); // Update space every 10 mins
+
+if (config.enableTelemetryReporting) {
+  setInterval(sendTelemetryReport, 10 * 60 * 1000);
+}