Skip to content

Commit

Permalink
release/2.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@southbite
southbite committed Apr 20, 2017
1 parent 1646561 commit 648e9df
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 71 deletions.
7 changes: 7 additions & 0 deletions RELEASES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,3 +445,10 @@

- node-uuid updated to uuid
- revoke session flag on client disconnect

2.20.0 2017-04-20
-----------------

- login with token


2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "happn",
"description": "pub/sub api as a service using primus and mongo & redis or nedb, can work as cluster, single process or embedded using nedb, use in production at your own risk",
"version": "2.19.0",
"version": "2.20.0",
"main": "./lib/index",
"protocol": "1.1.0",
"scripts": {
Expand Down
124 changes: 54 additions & 70 deletions test/3_eventemitter_websockets_embedded_sanity.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
property3: 'property3'
}, {noPublish: true}, function (e, result) {

////////////console.log('set happened');
////////////console.log([e, result]);
//////////////console.log('set happened');
//////////////console.log([e, result]);

if (!e) {
publisherclient.get('e2e_test1/testsubscribe/data/' + test_path_end, null, function (e, results) {
////////////console.log('new data results');
////////////console.log([e, results]);
//////////////console.log('new data results');
//////////////console.log([e, results]);

expect(results.property1 == 'property1').to.be(true);

Expand Down Expand Up @@ -156,24 +156,24 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
if (e)
return callback(e);

//////////////console.log('set results');
//////////////console.log(result);
////////////////console.log('set results');
////////////////console.log(result);

publisherclient.set('e2e_test1/testsubscribe/data/merge/' + test_path_end, {property4: 'property4'}, {merge: true}, function (e, result) {

if (e)
return callback(e);

//////////////console.log('merge set results');
//////////////console.log(result);
////////////////console.log('merge set results');
////////////////console.log(result);

publisherclient.get('e2e_test1/testsubscribe/data/merge/' + test_path_end, null, function (e, results) {

if (e)
return callback(e);

//////////////console.log('merge get results');
//////////////console.log(results);
////////////////console.log('merge get results');
////////////////console.log(results);

expect(results.property4).to.be('property4');
expect(results.property1).to.be('property1');
Expand All @@ -194,7 +194,7 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {

it('should search for a complex object', function (callback) {

//////////////////////////console.log('DOING COMPLEX SEARCH');
////////////////////////////console.log('DOING COMPLEX SEARCH');

var test_path_end = require('shortid').generate();

Expand Down Expand Up @@ -234,13 +234,13 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
publisherclient.set('/e2e_test1/testsubscribe/data/complex/' + test_path_end + '/1', complex_obj, null, function (e, put_result) {
expect(e == null).to.be(true);

////////////console.log('searching');
//////////////console.log('searching');
publisherclient.get('/e2e_test1/testsubscribe/data/complex*', {
criteria: criteria1,
options: options1
}, function (e, search_result) {

////////////console.log([e, search_result]);
//////////////console.log([e, search_result]);

expect(e == null).to.be(true);
expect(search_result.length == 1).to.be(true);
Expand Down Expand Up @@ -284,8 +284,8 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
expect(e).to.be(null);
expect(result._meta.status).to.be('ok');

////////////////////console.log('DELETE RESULT');
////////////////////console.log(result);
//////////////////////console.log('DELETE RESULT');
//////////////////////console.log(result);

callback();
});
Expand Down Expand Up @@ -350,20 +350,20 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {

}, function (e) {

//////////////////console.log('ON HAS HAPPENED: ' + e);
////////////////////console.log('ON HAS HAPPENED: ' + e);

if (!e) {

expect(listenerclient.events['/SET@/e2e_test1/testsubscribe/data/event'].length).to.be(1);
//////////////////console.log('on subscribed, about to publish');
////////////////////console.log('on subscribed, about to publish');

//then make the change
publisherclient.set('/e2e_test1/testsubscribe/data/event', {
property1: 'property1',
property2: 'property2',
property3: 'property3'
}, null, function (e, result) {
////////////////////////////console.log('put happened - listening for result');
//////////////////////////////console.log('put happened - listening for result');
});
} else
callback(e);
Expand Down Expand Up @@ -392,8 +392,8 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {

if (!e) {
publisherclient.get('e2e_test1/testsubscribe/data/' + test_path_end, null, function (e, results) {
////////////////////////console.log('new data results');
////////////////////////console.log(results);
//////////////////////////console.log('new data results');
//////////////////////////console.log(results);

expect(results.property1 == 'property1').to.be(true);

Expand Down Expand Up @@ -507,15 +507,15 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {

expect(listenerclient.events['/SET@/e2e_test1/testsubscribe/data/event'].length).to.be(1);

////////////////////////////console.log('on subscribed, about to publish');
//////////////////////////////console.log('on subscribed, about to publish');

//then make the change
publisherclient.set('/e2e_test1/testsubscribe/data/event', {
property1: 'property1',
property2: 'property2',
property3: 'property3'
}, null, function (e, result) {
////////////////////////////console.log('put happened - listening for result');
//////////////////////////////console.log('put happened - listening for result');
});
} else
callback(e);
Expand Down Expand Up @@ -572,53 +572,53 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
property3: 'property3'
}, null, function (e, result) {

//////////////////console.log('did delete set');
////////////////////console.log('did delete set');
//path, event_type, count, handler, done
//We listen for the DELETE event
listenerclient.on('/e2e_test1/testsubscribe/data/delete_me', {
event_type: 'remove',
count: 1
}, function (eventData) {

////console.log('on count 1 delete ');
//////////////////console.log(message);
//////console.log('on count 1 delete ');
////////////////////console.log(message);

//we are looking at the event internals on the listener to ensure our event management is working - because we are only listening for 1
//instance of this event - the event listener should have been removed
////console.log('listenerclient.events');
////console.log(listenerclient.events);
//////console.log('listenerclient.events');
//////console.log(listenerclient.events);
expect(listenerclient.events['/REMOVE@/e2e_test1/testsubscribe/data/delete_me'].length).to.be(0);

////console.log(eventData);
//////console.log(eventData);

//we needed to have removed a single item
expect(eventData.removed).to.be(1);

////////////////////////////console.log(message);
//////////////////////////////console.log(message);

callback();

}, function (e) {

////////////console.log('ON HAS HAPPENED: ' + e);
//////////////console.log('ON HAS HAPPENED: ' + e);

if (!e) {
////console.log('listenerclient.events, pre');
////console.log(listenerclient.events);
//////console.log('listenerclient.events, pre');
//////console.log(listenerclient.events);
expect(listenerclient.events['/REMOVE@/e2e_test1/testsubscribe/data/delete_me'].length).to.be(1);

//////////////////console.log('subscribed, about to delete');
////////////////////console.log('subscribed, about to delete');

//We perform the actual delete
publisherclient.remove('/e2e_test1/testsubscribe/data/delete_me', null, function (e, result) {


//////////////////console.log('REMOVE HAPPENED!!!');
//////////////////console.log(e);
//////////////////console.log(result);
////////////////////console.log('REMOVE HAPPENED!!!');
////////////////////console.log(e);
////////////////////console.log(result);


////////////////////////////console.log('put happened - listening for result');
//////////////////////////////console.log('put happened - listening for result');
});
} else
callback(e);
Expand All @@ -638,7 +638,7 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
listenerclient.on('/e2e_test1/testsubscribe/data/on_off_test', {event_type: 'set', count: 0}, function (message) {

//we detach all listeners from the path here
////console.log('ABOUT OFF PATH');
//////console.log('ABOUT OFF PATH');
listenerclient.offPath('/e2e_test1/testsubscribe/data/on_off_test', function (e) {

if (e)
Expand All @@ -647,8 +647,8 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
listenerclient.on('/e2e_test1/testsubscribe/data/on_off_test', {event_type: 'set', count: 0},
function (message) {

////console.log('ON RAN');
////console.log(message);
//////console.log('ON RAN');
//////console.log(message);

listenerclient.off(currentListenerId, function (e) {

Expand All @@ -672,8 +672,8 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
}, {}, function (e, setresult) {
if (e) return callback(new Error(e));

////console.log('DID ON SET');
////console.log(setresult);
//////console.log('DID ON SET');
//////console.log(setresult);
});

});
Expand Down Expand Up @@ -713,8 +713,8 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {

}, function (e) {

////console.log('on all ok?');
////console.log(e);
//////console.log('on all ok?');
//////console.log(e);

if (e) return callback(e);

Expand All @@ -725,13 +725,13 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
property3: 'property3'
}, null, function (e, put_result) {

////////////////////////console.log('put_result');
////////////////////////console.log(put_result);
//////////////////////////console.log('put_result');
//////////////////////////console.log(put_result);

publisherclient.remove('/e2e_test1/testsubscribe/data/catch_all', null, function (e, del_result) {

////////////////////////console.log('del_result');
////////////////////////console.log(del_result);
//////////////////////////console.log('del_result');
//////////////////////////console.log(del_result);

});

Expand Down Expand Up @@ -786,7 +786,7 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
});
});

it('unsubscribe from the right event', function (done) {
it('unsubscribes from the right event', function (callback) {

this.timeout(10000);

Expand All @@ -799,54 +799,45 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
var utils = {
subscribeToPath: function subscribeToPath(path) {

console.log('subscribeToPath happened:::');

return new Promise(function (resolve, reject) {
publisherclient.on(path, {event_type: 'set', count: 0}, function (data) {

}, function (err, handle) {
if (err) return reject(err);
console.log('subscribeToPath subscription worked:::');
resolve(handle);
});
})
},
storeHandle1: function (handle) {
console.log('storeHandle1 happened:::');
//console.log('storeHandle1 happened:::');
handle1 = handle;
},
storeHandle2: function (handle) {
console.log('storeHandle2 happened:::');
handle2 = handle;
},
unsubscribeFromHandle: function unsubscribeFromHandle(handle) {

console.log('unsubscribeFromHandle happened:::');

return new Promise(function (resolve) {
publisherclient.off(handle, function(e){
console.log('unsubscribeFromHandle unsubscribe happened:::', e);
//console.log('unsubscribeFromHandle unsubscribe happened:::', e);
resolve();
});
});
},
checkResults: function checkResults() {

console.log('checkResults happened:::');

return new Promise(function (resolve) {
// path 1 should have no listeners
expect(publisherclient.events['/SET@' + path1].length).to.equal(0);
// path 2 should still have its listener
expect(publisherclient.events['/SET@' + path2].length).to.equal(1);

console.log('checkResults expectations reached:::');
resolve();
})
}
};

return utils.subscribeToPath(path1)
utils.subscribeToPath(path1)
.then(utils.storeHandle1)
.then(function () {
return utils.subscribeToPath(path2);
Expand All @@ -859,16 +850,9 @@ describe('3_eventemitter_websockets_embedded_sanity', function () {
.then(function () {
return utils.unsubscribeFromHandle(handle2);
})
.then(function(){
console.log('ALL GOOD CALLING BACK:::');
done();
})
.catch(function(e){
console.log('error happened:::', e.toString());
done(e);
});
.then(callback)
.catch(callback);
});

//require('benchmarket').stop();

});

0 comments on commit 648e9df

Please sign in to comment.