Skip to content
This repository has been archived by the owner on Jun 14, 2019. It is now read-only.

Commit

Permalink
release 0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@knalli
knalli committed May 19, 2014
1 parent 05af5ca commit 43a9d2a
Show file tree
Hide file tree
Showing 5 changed files with 223 additions and 59 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<a name="v0.6.0"></a>
## v0.6.0 (2014-05-19)


#### Bug Fixes

* **vertxEventBusProvider:**
* avoid default options object mutations ([031871cf](http://github.com/knalli/angular-vertxbus/commit/031871cf345cdfc375b5a81c41a2ab1142fb5642))
* make config functions chainable ([7b02eab6](http://github.com/knalli/angular-vertxbus/commit/7b02eab6124bd5fb5e4b0cd2fe433b1af787ff74))
* **vertxEventBusService:**
* on registerHandler, return function to unregister this handler ([1f1b6bd7](http://github.com/knalli/angular-vertxbus/commit/1f1b6bd7394ad1a4716db8fc3703a5e9c337b2c2))
* on unregistering a handler, the callback was called accidently itself ([2dfcd112](http://github.com/knalli/angular-vertxbus/commit/2dfcd1128d250b587496f6fb33d5419cd9b69e29))


#### Features

* **vertxEventBusService:** add opt-in feature buffering messages ([de0e1345](http://github.com/knalli/angular-vertxbus/commit/de0e1345687fa21a94cc40e7b2fef783b312a4b2))

<a name="v0.5.0"></a>
## v0.5.0 (2014-03-17)

Expand Down
1 change: 0 additions & 1 deletion dist/angular-vertxbus-0.5.0.min.js
View file

This file was deleted.

131 changes: 102 additions & 29 deletions dist/angular-vertxbus-0.5.0.js → dist/angular-vertxbus-0.6.0.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! angular-vertxbus - v0.5.0 - 2014-03-17
/*! angular-vertxbus - v0.6.0 - 2014-05-19
* http://github.com/knalli/angular-vertxbus
* Copyright (c) 2014 ; Licensed */
(function () {
Expand All @@ -12,7 +12,8 @@
reconnectEnabled: true,
sockjsStateInterval: 10000,
sockjsReconnectInterval: 10000,
sockjsOptions: {}
sockjsOptions: {},
messageBuffer: 0
};
/*
An AngularJS wrapper for projects using the VertX Event Bus
Expand All @@ -29,7 +30,7 @@
* sockjsReconnectInterval (default 10000 ms): defines the wait time for a reconnect after a disconnect has been recognized
* sockjsOptions (default {}): optional SockJS options (new SockJS(url, undefined, options))
*/
module = angular.module('knalli.angular-vertxbus', ['ng']).constant('angularVertxbusOptions', DEFAULT_OPTIONS).provider('vertxEventBus', [
module = angular.module('knalli.angular-vertxbus', ['ng']).constant('angularVertxbusOptions', angular.extend({}, DEFAULT_OPTIONS)).provider('vertxEventBus', [
'angularVertxbusOptions',
function (angularVertxbusOptions) {
this.enable = function (value) {
Expand All @@ -51,42 +52,56 @@
value = DEFAULT_OPTIONS.prefix;
}
angularVertxbusOptions.prefix = value;
return this;
};
this.useUrlServer = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.urlServer;
}
angularVertxbusOptions.urlServer = value;
return this;
};
this.useUrlPath = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.urlPath;
}
angularVertxbusOptions.urlPath = value;
return this;
};
this.useReconnect = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.reconnectEnabled;
}
angularVertxbusOptions.reconnectEnabled = value;
return this;
};
this.useSockJsStateInterval = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.sockjsStateInterval;
}
angularVertxbusOptions.sockjsStateInterval = value;
return this;
};
this.useSockJsReconnectInterval = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.sockjsReconnectInterval;
}
angularVertxbusOptions.sockjsReconnectInterval = value;
return this;
};
this.useSockJsOptions = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.sockjsOptions;
}
angularVertxbusOptions.sockjsOptions = value;
return this;
};
this.useMessageBuffer = function (value) {
if (value == null) {
value = DEFAULT_OPTIONS.messageBuffer;
}
angularVertxbusOptions.messageBuffer = value;
return this;
};
/*
A stub representing the VertX Event Bus (core functionality)
Expand Down Expand Up @@ -160,7 +175,10 @@
return eventBus.publish(address, message);
},
registerHandler: function (address, handler) {
return eventBus.registerHandler(address, handler);
eventBus.registerHandler(address, handler);
return function () {
stub.unregisterHandler(address, handler);
};
},
unregisterHandler: function (address, handler) {
return eventBus.unregisterHandler(address, handler);
Expand Down Expand Up @@ -207,12 +225,39 @@
'vertxEventBus',
'angularVertxbusOptions',
function ($rootScope, $q, $interval, $timeout, vertxEventBus, angularVertxbusOptions) {
var api, connectionState, debugEnabled, enabled, prefix, reconnectEnabled, sockjsOptions, sockjsReconnectInterval, sockjsStateInterval, urlPath, urlServer, util, wrapped, _ref, _ref1;
_ref = angular.extend({}, DEFAULT_OPTIONS, angularVertxbusOptions), enabled = _ref.enabled, debugEnabled = _ref.debugEnabled, prefix = _ref.prefix, urlServer = _ref.urlServer, urlPath = _ref.urlPath, reconnectEnabled = _ref.reconnectEnabled, sockjsStateInterval = _ref.sockjsStateInterval, sockjsReconnectInterval = _ref.sockjsReconnectInterval, sockjsOptions = _ref.sockjsOptions;
var MessageQueueHolder, api, connectionState, debugEnabled, enabled, ensureOpenConnection, messageBuffer, messageQueueHolder, prefix, reconnectEnabled, sockjsOptions, sockjsReconnectInterval, sockjsStateInterval, urlPath, urlServer, util, wrapped, _ref, _ref1;
MessageQueueHolder = function () {
function MessageQueueHolder(maxSize) {
this.maxSize = maxSize != null ? maxSize : 10;
this.items = [];
}
MessageQueueHolder.prototype.push = function (item) {
this.items.push(item);
return this.recalibrateBufferSize();
};
MessageQueueHolder.prototype.recalibrateBufferSize = function () {
while (this.items.length > this.maxSize) {
this.first();
}
return this;
};
MessageQueueHolder.prototype.last = function () {
return this.items.pop();
};
MessageQueueHolder.prototype.first = function () {
return this.items.shift(0);
};
MessageQueueHolder.prototype.size = function () {
return this.items.length;
};
return MessageQueueHolder;
}();
_ref = angular.extend({}, DEFAULT_OPTIONS, angularVertxbusOptions), enabled = _ref.enabled, debugEnabled = _ref.debugEnabled, prefix = _ref.prefix, urlServer = _ref.urlServer, urlPath = _ref.urlPath, reconnectEnabled = _ref.reconnectEnabled, sockjsStateInterval = _ref.sockjsStateInterval, sockjsReconnectInterval = _ref.sockjsReconnectInterval, sockjsOptions = _ref.sockjsOptions, messageBuffer = _ref.messageBuffer;
connectionState = vertxEventBus != null ? (_ref1 = vertxEventBus.EventBus) != null ? _ref1.CLOSED : void 0 : void 0;
messageQueueHolder = new MessageQueueHolder(messageBuffer);
if (enabled && vertxEventBus) {
vertxEventBus.onopen = function () {
var address, callback, callbacks, _i, _len, _ref2;
var address, callback, callbacks, fn, _i, _len, _ref2;
wrapped.getConnectionState(true);
$rootScope.$broadcast('' + prefix + 'system.connected');
_ref2 = wrapped.handlers;
Expand All @@ -225,13 +270,32 @@
util.registerHandler(address, callback);
}
}
return $rootScope.$digest();
$rootScope.$digest();
if (messageBuffer && messageQueueHolder.size()) {
while (messageQueueHolder.size()) {
fn = messageQueueHolder.first();
if (typeof fn === 'function') {
fn();
}
}
$rootScope.$digest();
}
};
vertxEventBus.onclose = function () {
wrapped.getConnectionState(true);
return $rootScope.$broadcast('' + prefix + 'system.disconnected');
};
}
ensureOpenConnection = function (fn) {
if (wrapped.getConnectionState() === vertxEventBus.EventBus.OPEN) {
fn();
return true;
} else if (messageBuffer) {
messageQueueHolder.push(fn);
return true;
}
return false;
};
util = {
registerHandler: function (address, callback) {
if (typeof callback !== 'function') {
Expand All @@ -255,30 +319,39 @@
return vertxEventBus.unregisterHandler(address, callback);
},
send: function (address, message, expectReply, timeout) {
var deferred;
var deferred, dispatched;
if (timeout == null) {
timeout = 10000;
}
if (expectReply) {
deferred = $q.defer();
}
vertxEventBus.send(address, message, function (reply) {
dispatched = ensureOpenConnection(function () {
vertxEventBus.send(address, message, function (reply) {
if (deferred) {
deferred.resolve(reply);
}
if (typeof expectReply === 'function') {
return expectReply(reply);
}
});
if (deferred) {
deferred.resolve(reply);
}
if (typeof expectReply === 'function') {
return expectReply(reply);
return $timeout(function () {
return deferred.reject();
}, timeout);
}
});
if (deferred) {
$timeout(function () {
return deferred.reject();
}, timeout);
if (deferred && !dispatched) {
deferred.reject();
}
return deferred != null ? deferred.promise : void 0;
},
publish: function (address, message) {
return vertxEventBus.publish(address, message);
var dispatched;
dispatched = ensureOpenConnection(function () {
return vertxEventBus.publish(address, message);
});
return dispatched;
}
};
wrapped = {
Expand All @@ -289,12 +362,15 @@
}
wrapped.handlers[address].push(callback);
if (connectionState === vertxEventBus.EventBus.OPEN) {
return util.registerHandler(address, callback);
util.registerHandler(address, callback);
}
return function () {
wrapped.unregisterHandler(address, callback);
};
},
unregisterHandler: function (address, callback) {
var index;
if (wrapped.handlers[address] && callback(wrapped.handlers[address])) {
if (wrapped.handlers[address]) {
index = wrapped.handlers[address].indexOf(callback);
if (index > -1) {
wrapped.handlers[address].splice(index, 1);
Expand All @@ -308,16 +384,10 @@
if (timeout == null) {
timeout = 10000;
}
if (connectionState === vertxEventBus.EventBus.OPEN) {
return util.send(address, message, expectReply, timeout);
} else {
return $q.reject('unknown');
}
return util.send(address, message, expectReply, timeout);
},
publish: function (address, message) {
if (connectionState === vertxEventBus.EventBus.OPEN) {
return util.publish(address, message);
}
return util.publish(address, message);
},
getConnectionState: function (immediate) {
if (vertxEventBus != null ? vertxEventBus.EventBus : void 0) {
Expand Down Expand Up @@ -348,6 +418,9 @@
readyState: wrapped.getConnectionState,
isEnabled: function () {
return enabled;
},
getBufferCount: function () {
return messageQueueHolder.size();
}
};
return api;
Expand Down
Loading

0 comments on commit 43a9d2a

Please sign in to comment.