Merge pull request #176 from tomvantilburg/master

New way of deploying superpeer with config file

dist/cow.js

@@ -2820,7 +2820,7 @@ Cow.core = function(config){
     if (typeof(config) == 'undefined' ) {
         config = {};
     }
-    this._version = '2.0.2';
+    this._version = '2.0.3';
     this._herdname = config.herdname || 'cow';
     this._userid = null;
     this._socketserverid = null;

dist/cow.node.js

@@ -2752,7 +2752,7 @@ Cow.core = function(config){
     if (typeof(config) == 'undefined' ) {
         config = {};
     }
-    this._version = '2.0.2';
+    this._version = '2.0.3';
     this._herdname = config.herdname || 'cow';
     this._userid = null;
     this._socketserverid = null;

src/cow2.core.js

@@ -16,7 +16,7 @@ Cow.core = function(config){
     if (typeof(config) == 'undefined' ) {
         config = {};
     }
-    this._version = '2.0.2';
+    this._version = '2.0.3';
     this._herdname = config.herdname || 'cow';
     this._userid = null;
     this._socketserverid = null;

src/superpeer/ontw.json

@@ -0,0 +1,8 @@
+{
+	"dbUrl": "tcp://geodan:[email protected]/cow",
+	"herdname":"ontw",
+	"protocol": "wss",
+	"ip": "websocket.geodan.nl",
+	"port": 443,
+	"dir": "ontw"
+}

src/superpeer/readme.md

@@ -0,0 +1,16 @@
+Make a new superpeer with:
+```
+node superpeer.js config.json
+```
+
+Config file should look like:
+```
+{
+	"dbUrl": "tcp://user:pass@ip/db",
+	"herdname":"blabla",
+	"protocol": "wss",
+	"ip": "ip.to.socketserver",
+	"port": 443,
+	"dir": "blabla"
+}   
+```

src/superpeer/speer.js

@@ -1,7 +1,9 @@
 _ = require('../../node_modules/underscore/underscore.js')._
 Promise = require('../../node_modules/es6-promise').Promise;
 Events = require('../../src/events.js');
-//log = require('../../lib/loglevel/loglevel.min.js');
+
+
+
 /**
     !! websocket source code has been changed !!
     node_modules/websocket/lib/WebSocketClient.js, line 251

src/superpeer/superpeer.js

@@ -0,0 +1,39 @@
+configfile = process.argv[2];
+config = require('./'+ configfile);
+
+_ = require('../../node_modules/underscore/underscore.js')._
+Promise = require('../../node_modules/es6-promise').Promise;
+Events = require('../../src/events.js');
+
+WebSocket = require('websocket').client;
+pg = require('pg').native;
+//Set global dbUrl
+GLOBAL.dbUrl = config.dbUrl;
+//Set env var to accept all certificates
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+Cow = require('./cow.node.js');
+
+
+core = new Cow.core({
+    herdname: config.herdname,
+    maxage: 1000 * 60 * 60 * 24 * 365 //one year 
+});
+core.socketservers({
+        _id: 'default', 
+        data: {
+        	protocol:config.protocol,
+        	ip:config.ip, 
+        	port:config.port,
+        	dir: config.dir}
+      });
+core.socketserver('default');
+core.connect();
+core.userStore().loaded.then(function(){
+	console.log(core.users().length, ' users loaded');
+});
+
+core.projectStore().loaded.then(function(){
+	console.log(core.projects().length, ' projects loaded');
+	core.peer().data('superpeer', true).sync();
+	console.log('My peerid: ', core.peerid()); //dirty hack
+});