Author: ceposta
Date: Mon Dec 3 13:06:35 2012
New Revision: 1416498
URL: http://svn.apache.org/viewvc?rev=1416498&view=rev
Log:
https://issues.apache.org/jira/browse/APLO-273 - Update the websocket example
to use the latest stomp.js which supports STOMP 1.1 (including heart-beating).
Jeff Mensil provided patch. Thank you!
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/examples/websocket/js/stomp.js
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/examples/websocket/js/stomp.js
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/examples/websocket/js/stomp.js?rev=1416498&r1=1416497&r2=1416498&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/examples/websocket/js/stomp.js
(original)
+++
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/examples/websocket/js/stomp.js
Mon Dec 3 13:06:35 2012
@@ -1,55 +1,45 @@
-// Generated by CoffeeScript 1.3.1
+// Generated by CoffeeScript 1.3.3
+(function() {
+ var Byte, Client, Frame, Stomp,
+ __hasProp = {}.hasOwnProperty;
-/*
-Copyright (C) 2010 Jeff Mesnil -- http://jmesnil.net/
-Copyright (C) 2012 FuseSource, Inc. -- http://fusesource.com
-*/
+ Byte = {
+ LF: '\x0A',
+ NULL: '\x00'
+ };
+ Frame = (function() {
-(function() {
- var Client, Stomp, WebSocketStompMock,
- __hasProp = {}.hasOwnProperty;
+ function Frame(command, headers, body) {
+ this.command = command;
+ this.headers = headers != null ? headers : {};
+ this.body = body != null ? body : '';
+ }
- Stomp = {
- frame: function(command, headers, body) {
- if (headers == null) {
- headers = [];
+ Frame.prototype.toString = function() {
+ var lines, name, value, _ref;
+ lines = [this.command];
+ _ref = this.headers;
+ for (name in _ref) {
+ if (!__hasProp.call(_ref, name)) continue;
+ value = _ref[name];
+ lines.push("" + name + ":" + value);
}
- if (body == null) {
- body = '';
+ if (this.body) {
+ lines.push("content-length:" + ('' + this.body).length);
}
- return {
- command: command,
- headers: headers,
- body: body,
- id: headers.id,
- receipt: headers.receipt,
- transaction: headers.transaction,
- destination: headers.destination,
- subscription: headers.subscription,
- error: null,
- toString: function() {
- var lines, name, value;
- lines = [command];
- for (name in headers) {
- if (!__hasProp.call(headers, name)) continue;
- value = headers[name];
- lines.push("" + name + ":" + value);
- }
- lines.push('\n' + body);
- return lines.join('\n');
- }
- };
- },
- unmarshal: function(data) {
- var body, chr, command, divider, headerLines, headers, i, idx, line,
trim, _i, _j, _ref, _ref1, _ref2;
- divider = data.search(/\n\n/);
- headerLines = data.substring(0, divider).split('\n');
+ lines.push(Byte.LF + this.body);
+ return lines.join(Byte.LF);
+ };
+
+ Frame._unmarshallSingle = function(data) {
+ var body, chr, command, divider, headerLines, headers, i, idx, len,
line, start, trim, _i, _j, _ref, _ref1;
+ divider = data.search(RegExp("" + Byte.LF + Byte.LF));
+ headerLines = data.substring(0, divider).split(Byte.LF);
command = headerLines.shift();
headers = {};
- body = '';
trim = function(str) {
- return str.replace(/^\s+/g, '').replace(/\s+$/g, '');
+ return str.replace(/^\s+|\s+$/g, '');
};
line = idx = null;
for (i = _i = 0, _ref = headerLines.length; 0 <= _ref ? _i < _ref : _i >
_ref; i = 0 <= _ref ? ++_i : --_i) {
@@ -57,134 +47,221 @@ Copyright (C) 2012 FuseSource, Inc. -- h
idx = line.indexOf(':');
headers[trim(line.substring(0, idx))] = trim(line.substring(idx + 1));
}
- chr = null;
- for (i = _j = _ref1 = divider + 2, _ref2 = data.length; _ref1 <= _ref2 ?
_j < _ref2 : _j > _ref2; i = _ref1 <= _ref2 ? ++_j : --_j) {
- chr = data.charAt(i);
- if (chr === '\x00') {
- break;
+ body = '';
+ start = divider + 2;
+ if (headers['content-length']) {
+ len = parseInt(headers['content-length']);
+ body = ('' + data).substring(start, start + len);
+ } else {
+ chr = null;
+ for (i = _j = start, _ref1 = data.length; start <= _ref1 ? _j < _ref1
: _j > _ref1; i = start <= _ref1 ? ++_j : --_j) {
+ chr = data.charAt(i);
+ if (chr === Byte.NULL) {
+ break;
+ }
+ body += chr;
}
- body += chr;
}
- return Stomp.frame(command, headers, body);
- },
- unmarshal_multi: function(multi_datas) {
- var data, datas;
- datas = (function() {
+ return new Frame(command, headers, body);
+ };
+
+ Frame.unmarshall = function(datas) {
+ var data;
+ return (function() {
var _i, _len, _ref, _results;
- _ref = multi_datas.split(/\x00\n*/);
+ _ref = datas.split(RegExp("" + Byte.NULL + Byte.LF + "*"));
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
data = _ref[_i];
- if (data && data.length > 0) {
- _results.push(Stomp.unmarshal(data));
+ if ((data != null ? data.length : void 0) > 0) {
+ _results.push(Frame._unmarshallSingle(data));
}
}
return _results;
})();
- return datas;
- },
- marshal: function(command, headers, body) {
- return Stomp.frame(command, headers, body).toString() + '\x00';
- },
- client: function(url) {
- return new Client(url);
- }
- };
+ };
- Client = (function() {
+ Frame.marshall = function(command, headers, body) {
+ var frame;
+ frame = new Frame(command, headers, body);
+ return frame.toString() + Byte.NULL;
+ };
+
+ return Frame;
+
+ })();
- Client.name = 'Client';
+ Client = (function() {
- function Client(url) {
- this.url = url;
+ function Client(ws) {
+ this.ws = ws;
+ this.ws.binaryType = "arraybuffer";
this.counter = 0;
this.connected = false;
+ this.heartbeat = {
+ outgoing: 10000,
+ incoming: 10000
+ };
this.subscriptions = {};
}
Client.prototype._transmit = function(command, headers, body) {
var out;
- out = Stomp.marshal(command, headers, body);
+ out = Frame.marshall(command, headers, body);
if (typeof this.debug === "function") {
this.debug(">>> " + out);
}
return this.ws.send(out);
};
- Client.prototype.connect = function(login_, passcode_, connectCallback,
errorCallback) {
- var klass,
+ Client.prototype._setupHeartbeat = function(headers) {
+ var serverIncoming, serverOutgoing, ttl, v, _ref, _ref1,
_this = this;
+ if ((_ref = headers.version) !== Stomp.VERSIONS.V1_1 && _ref !==
Stomp.VERSIONS.V1_2) {
+ return;
+ }
+ _ref1 = (function() {
+ var _i, _len, _ref1, _results;
+ _ref1 = headers['heart-beat'].split(",");
+ _results = [];
+ for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+ v = _ref1[_i];
+ _results.push(parseInt(v));
+ }
+ return _results;
+ })(), serverOutgoing = _ref1[0], serverIncoming = _ref1[1];
+ if (!(this.heartbeat.outgoing === 0 || serverIncoming === 0)) {
+ ttl = Math.max(this.heartbeat.outgoing, serverIncoming);
+ if (typeof this.debug === "function") {
+ this.debug("send PING every " + ttl + "ms");
+ }
+ this.pinger = typeof window !== "undefined" && window !== null ?
window.setInterval(function() {
+ _this.ws.send(Byte.LF);
+ return typeof _this.debug === "function" ? _this.debug(">>> PING") :
void 0;
+ }, ttl) : void 0;
+ }
+ if (!(this.heartbeat.incoming === 0 || serverOutgoing === 0)) {
+ ttl = Math.max(this.heartbeat.incoming, serverOutgoing);
+ if (typeof this.debug === "function") {
+ this.debug("check PONG every " + ttl + "ms");
+ }
+ return this.ponger = typeof window !== "undefined" && window !== null
? window.setInterval(function() {
+ var delta;
+ delta = Date.now() - _this.serverActivity;
+ if (delta > ttl * 2) {
+ if (typeof _this.debug === "function") {
+ _this.debug("did not receive server activity for the last " +
delta + "ms");
+ }
+ return _this._cleanUp();
+ }
+ }, ttl) : void 0;
+ }
+ };
+
+ Client.prototype.connect = function(login, passcode, connectCallback,
errorCallback, vhost) {
+ var _this = this;
+ this.connectCallback = connectCallback;
if (typeof this.debug === "function") {
this.debug("Opening Web Socket...");
}
- klass = WebSocketStompMock || WebSocket;
- this.ws = new klass(this.url);
- this.ws.binaryType = "arraybuffer";
this.ws.onmessage = function(evt) {
- var data, frame, i, onreceive, view, _i, _len, _ref, _results;
- data = (function() {
- var _i, _len;
- if (evt.data instanceof ArrayBuffer) {
- view = new Uint8Array(evt.data);
- if (typeof this.debug === "function") {
- this.debug('--- got data length: ' + view.length);
- }
- data = "";
- for (_i = 0, _len = view.length; _i < _len; _i++) {
- i = view[_i];
- data += String.fromCharCode(i);
- }
- return data;
- } else {
- return evt.data;
+ var arr, c, data, frame, onreceive, _i, _len, _ref, _results;
+ data = typeof ArrayBuffer !== 'undefined' && evt.data instanceof
ArrayBuffer ? (arr = new Uint8Array(evt.data), typeof _this.debug ===
"function" ? _this.debug("--- got data length: " + arr.length) : void 0,
((function() {
+ var _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = arr.length; _i < _len; _i++) {
+ c = arr[_i];
+ _results.push(String.fromCharCode(c));
+ }
+ return _results;
+ })()).join('')) : evt.data;
+ _this.serverActivity = Date.now();
+ if (data === Byte.LF) {
+ if (typeof _this.debug === "function") {
+ _this.debug("<<< PONG");
}
- }).call(_this);
+ return;
+ }
if (typeof _this.debug === "function") {
- _this.debug('<<< ' + data);
+ _this.debug("<<< " + data);
}
- _ref = Stomp.unmarshal_multi(data);
+ _ref = Frame.unmarshall(data);
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
frame = _ref[_i];
- if (frame.command === "CONNECTED" && connectCallback) {
- _this.connected = true;
- _results.push(connectCallback(frame));
- } else if (frame.command === "MESSAGE") {
- onreceive = _this.subscriptions[frame.headers.subscription];
- _results.push(typeof onreceive === "function" ? onreceive(frame) :
void 0);
- } else if (frame.command === "ERROR") {
- _results.push(typeof errorCallback === "function" ?
errorCallback(frame) : void 0);
- } else {
- _results.push(typeof _this.debug === "function" ?
_this.debug("Unhandled frame: " + frame) : void 0);
+ switch (frame.command) {
+ case "CONNECTED":
+ if (typeof _this.debug === "function") {
+ _this.debug("connected to server " + frame.headers.server);
+ }
+ _this.connected = true;
+ _this._setupHeartbeat(frame.headers);
+ _results.push(typeof _this.connectCallback === "function" ?
_this.connectCallback(frame) : void 0);
+ break;
+ case "MESSAGE":
+ onreceive = _this.subscriptions[frame.headers.subscription];
+ _results.push(typeof onreceive === "function" ? onreceive(frame)
: void 0);
+ break;
+ case "RECEIPT":
+ _results.push(typeof _this.onreceipt === "function" ?
_this.onreceipt(frame) : void 0);
+ break;
+ case "ERROR":
+ _results.push(typeof errorCallback === "function" ?
errorCallback(frame) : void 0);
+ break;
+ default:
+ _results.push(typeof _this.debug === "function" ?
_this.debug("Unhandled frame: " + frame) : void 0);
}
}
return _results;
};
this.ws.onclose = function() {
var msg;
- msg = "Whoops! Lost connection to " + _this.url;
+ msg = "Whoops! Lost connection to " + _this.ws.url;
if (typeof _this.debug === "function") {
_this.debug(msg);
}
return typeof errorCallback === "function" ? errorCallback(msg) : void
0;
};
- this.ws.onopen = function() {
+ return this.ws.onopen = function() {
+ var headers;
if (typeof _this.debug === "function") {
_this.debug('Web Socket Opened...');
}
- return _this._transmit("CONNECT", {
- login: login_,
- passcode: passcode_
- });
+ headers = {
+ "accept-version": Stomp.VERSIONS.supportedVersions(),
+ "heart-beat": [_this.heartbeat.outgoing,
_this.heartbeat.incoming].join(',')
+ };
+ if (vhost) {
+ headers.host = vhost;
+ }
+ if (login) {
+ headers.login = login;
+ }
+ if (passcode) {
+ headers.passcode = passcode;
+ }
+ return _this._transmit("CONNECT", headers);
};
- return this.connectCallback = connectCallback;
};
Client.prototype.disconnect = function(disconnectCallback) {
this._transmit("DISCONNECT");
+ this.ws.onclose = null;
+ this._cleanUp();
+ return typeof disconnectCallback === "function" ? disconnectCallback() :
void 0;
+ };
+
+ Client.prototype._cleanUp = function() {
this.ws.close();
this.connected = false;
- return typeof disconnectCallback === "function" ? disconnectCallback() :
void 0;
+ if (this.pinger) {
+ if (typeof window !== "undefined" && window !== null) {
+ window.clearInterval(this.pinger);
+ }
+ }
+ if (this.ponger) {
+ return typeof window !== "undefined" && window !== null ?
window.clearInterval(this.ponger) : void 0;
+ }
};
Client.prototype.send = function(destination, headers, body) {
@@ -199,68 +276,95 @@ Copyright (C) 2012 FuseSource, Inc. -- h
};
Client.prototype.subscribe = function(destination, callback, headers) {
- var id;
if (headers == null) {
headers = {};
}
- id = "sub-" + this.counter++;
+ if (!headers.id) {
+ headers.id = "sub-" + this.counter++;
+ }
headers.destination = destination;
- headers.id = id;
- this.subscriptions[id] = callback;
+ this.subscriptions[headers.id] = callback;
this._transmit("SUBSCRIBE", headers);
- return id;
+ return headers.id;
};
- Client.prototype.unsubscribe = function(id, headers) {
- if (headers == null) {
- headers = {};
- }
- headers.id = id;
+ Client.prototype.unsubscribe = function(id) {
delete this.subscriptions[id];
- return this._transmit("UNSUBSCRIBE", headers);
+ return this._transmit("UNSUBSCRIBE", {
+ id: id
+ });
};
- Client.prototype.begin = function(transaction, headers) {
- if (headers == null) {
- headers = {};
- }
- headers.transaction = transaction;
- return this._transmit("BEGIN", headers);
+ Client.prototype.begin = function(transaction) {
+ return this._transmit("BEGIN", {
+ transaction: transaction
+ });
};
- Client.prototype.commit = function(transaction, headers) {
- if (headers == null) {
- headers = {};
- }
- headers.transaction = transaction;
- return this._transmit("COMMIT", headers);
+ Client.prototype.commit = function(transaction) {
+ return this._transmit("COMMIT", {
+ transaction: transaction
+ });
+ };
+
+ Client.prototype.abort = function(transaction) {
+ return this._transmit("ABORT", {
+ transaction: transaction
+ });
};
- Client.prototype.abort = function(transaction, headers) {
+ Client.prototype.ack = function(messageID, subscription, headers) {
if (headers == null) {
headers = {};
}
- headers.transaction = transaction;
- return this._transmit("ABORT", headers);
+ headers["message-id"] = messageID;
+ headers.subscription = subscription;
+ return this._transmit("ACK", headers);
};
- Client.prototype.ack = function(message_id, headers) {
+ Client.prototype.nack = function(messageID, subscription, headers) {
if (headers == null) {
headers = {};
}
- headers["message-id"] = message_id;
- return this._transmit("ACK", headers);
+ headers["message-id"] = messageID;
+ headers.subscription = subscription;
+ return this._transmit("NACK", headers);
};
return Client;
})();
+ Stomp = {
+ libVersion: "2.0.0-next",
+ VERSIONS: {
+ V1_0: '1.0',
+ V1_1: '1.1',
+ V1_2: '1.2',
+ supportedVersions: function() {
+ return '1.1,1.0';
+ }
+ },
+ client: function(url, protocols) {
+ var klass, ws;
+ if (protocols == null) {
+ protocols = ['v10.stomp', 'v11.stomp'];
+ }
+ klass = Stomp.WebSocketClass || WebSocket;
+ ws = new klass(url, protocols);
+ return new Client(ws);
+ },
+ over: function(ws) {
+ return new Client(ws);
+ },
+ Frame: Frame
+ };
+
if (typeof window !== "undefined" && window !== null) {
window.Stomp = Stomp;
} else {
exports.Stomp = Stomp;
- WebSocketStompMock = require('./test/server.mock.js').StompServerMock;
+ Stomp.WebSocketClass = require('./test/server.mock.js').StompServerMock;
}
}).call(this);
