added PeerJS and initial Network service

This commit is contained in:
Mario Colque 2014-03-27 16:31:42 -03:00
parent 7e34253495
commit 76eadc17cf
6 changed files with 188 additions and 12 deletions

View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">
<title>cosign - Multisignature Wallet</title>
<title>Cosign - Multisignature Wallet</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/main.css">
</head>
@ -34,12 +34,42 @@
<!-- Templates -->
<script type="text/ng-template" id="signin.html">
<form class="form-signin" role="form">
<h2 class="form-signin-heading">Please sign in</h2>
<input type="text" class="form-control" placeholder="Wallet ID" required autofocus>
<input type="password" class="form-control" placeholder="Password" required>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
</form>
<div class="text-center" ng-controller="SigninController">
<div ng-if="!peerReady">Opening peers...</div>
<div ng-if="peerReady">
<h1>Join or Create a New Connection</h1>
<div class="col-lg-12">
<div class="input-group">
<input type="text" class="form-control" placeholder="Peer ID" ng-model="connectionId" autofocus>
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="join(connectionId)"><i class="glyphicon glyphicon-log-in"></i> Join</button>
</span>
</div>
<hr>
<button class="btn btn-primary btn-block" ng-click="join()"><i class="glyphicon glyphicon-plus"></i> Create a New Connection</button>
</div>
</div>
</div>
</script>
<script type="text/ng-template" id="join.html">
<div ng-controller="JoinController" ng-init="init()">
<h1>Joined to <span class="text-muted">{{connectionId}}</span></h1>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Cosigners ({{cosigners.length}}/5)</h3>
</div>
<div class="panel-body">
<ul>
<li ng-repeat="cosigner in cosigners">
<span ng-if="cosigner == $root.peerId">You ({{$root.peerId}})</span>
<span ng-if="cosigner != $root.peerId">{{cosigner}}</span>
</li>
</ul>
</div>
</div>
<a href="#/home">Skip</a>
</div>
</script>
<script type="text/ng-template" id="home.html">
@ -54,14 +84,18 @@
<script src="lib/angular-route/angular-route.min.js"></script>
<script src="lib/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="lib/peerjs/peer.js"></script>
<script src="lib/peerjs/peer.min.js"></script>
<script src="js/app.js"></script>
<script src="js/config.js"></script>
<script src="js/directives.js"></script>
<script src="js/filters.js"></script>
<script src="js/services/network.js"></script>
<script src="js/controllers/header.js"></script>
<script src="js/controllers/signin.js"></script>
<script src="js/controllers/join.js"></script>
<script src="js/init.js"></script>
</body>

View File

@ -3,8 +3,14 @@
angular.module('cosign',[
'ngRoute',
'ui.bootstrap',
'cosign.header'
'cosign.header',
'cosign.signin',
'cosign.join',
'cosign.network'
]);
angular.module('cosign.header', []);
angular.module('cosign.signin', []);
angular.module('cosign.join', []);
angular.module('cosign.network', []);

View File

@ -6,11 +6,20 @@ angular
.config(function($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'signin.html'
})
.when('/signin', {
templateUrl: 'signin.html'
})
.when('/home', {
templateUrl: 'home.html'
})
.when('/join/:id', {
templateUrl: 'join.html'
})
.otherwise({
templateUrl: '404.html'
});
});

21
js/controllers/join.js Normal file
View File

@ -0,0 +1,21 @@
'use strict';
angular.module('cosign.join').controller('JoinController',
function($scope, $rootScope, $routeParams, Network) {
$scope.connectionId = $routeParams.id;
$scope.cosigners = [];
$scope.init = function() {
console.log('-------- init --------');
console.log($rootScope.peerId);
$scope.cosigners.push($rootScope.peerId);
Network.connect($scope.connectionId, function(cosigner) {
console.log('----- join connect --------');
console.log(cosigner);
$scope.cosigners.push(cosigner);
$scope.$digest();
});
};
});

24
js/controllers/signin.js Normal file
View File

@ -0,0 +1,24 @@
'use strict';
angular.module('cosign.signin').controller('SigninController',
function($scope, $rootScope, $location, Network) {
$rootScope.peerId = null;
$scope.peerReady = false;
// Init peer
Network.init(function(pid) {
$rootScope.peerId = pid;
$rootScope.$digest();
$scope.peerReady = true;
$scope.$digest();
});
$scope.join = function(cid) {
console.log('------- join --------');
console.log(cid);
var pid = cid || $rootScope.peerId;
$location.path('join/' + pid);
};
});

View File

@ -1,8 +1,90 @@
'use strict';
angular.module('cosign.network').factory('Network',
function() {
angular.module('cosign.network')
.factory('NetworkTest', function() {
this.f = function() {
return 2;
};
});
})
.factory('Network', function() {
var peer;
var connectedPeers = {};
var _onConnect = function(c, cb) {
if (c.label === 'wallet') {
var a = peer.connections[c.peer][0];
console.log(peer.connections[c.peer]);
a.send('------ origin recived -------');
c.on('data', function(data) {
console.log('------ new data ------');
console.log(data);
console.log(peer.connections);
c.on('close', function() {
alert(c.peer + ' has left the wallet.');
delete connectedPeers[c.peer];
});
});
setTimeout(function() {
a.send('.........................');
cb(c.peer);
}, 1000);
}
};
var _init = function(cb) {
peer = new Peer({
key: 'lwjd5qra8257b9',
debug: 3
});
peer.on('open', cb);
};
var _connect = function(pid, cb) {
peer.on('connection', function(conn) {
_onConnect(conn, cb);
});
var c = peer.connect(pid, {
label: 'wallet',
serialization: 'none',
reliable: false,
metadata: { message: 'hi! cosigners' }
});
c.on('open', function() {
c.send('-------oopen-------');
});
c.on('data', function(data) {
if (data)
console.log(data);
});
c.on('error', function(err) {
console.error(err);
});
};
var _sendTo = function(pid, data) {
if (typeof pids === 'string') {
// just send
} else if (typeof pids === 'array') {
// iter
}
console.log(data);
};
return {
init: _init,
connect: _connect,
sendTo: _sendTo
}
});