bfg-common 1.2.231 → 1.3.2

package/public/spice-console/network/busconnection.js

@@ -1,195 +1,195 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.BusConnection = $.spcExtend(wdi.EventObject.prototype, {
-	ws: null,
-	subscriptions: [],
-	_busUser: null,
-	_busPass: null,
-	queue: '',
-	binary: false,
-
-	init: function(c) {
-		this.superInit();
-		this.ws = c.websocket || new wdi.WebSocketWrapper();
-		this.clusterNodeChooser = c.clusterNodeChooser || new wdi.ClusterNodeChooser();
-		this.binary = c.binary || false;
-	},
-
-	connect: function(c) {
-		if (!c['useBus']) {
-			wdi.Debug.warn("Not using the bus");
-			return;
-		}
-        this._vdiBusToken = c['vdiBusToken'];
-		if (!c['busHostList']) {
-			wdi.Debug.warn("Deprecated: using old busHost & busPort params");
-			c['busHostList'] = [{
-				host: c['busHost'],
-				port: c['busPort']
-			}];
-		}
-		this.clusterNodeChooser.setNodeList(c['busHostList']);
-		if (Modernizr['websocketsbinary']) {
-			this.binary = true;
-		}
-		this._busUser = c['busUser'];
-		this._busPass = c['busPass'];
-		this._websockifyProtocol = c['protocol'];
-		this._websockifyHost = c['host'];
-		this._websockifyPort = c['port'];
-		this.subscriptions = c['busSubscriptions'];
-
-		this._connectToNextHost();
-	},
-
-	_connectToNextHost: function () {
-		var busData = this.clusterNodeChooser.getAnother();
-
-		// c['protocol'] is the protocol we use to connect to websockify
-		// ie: ws, wss, https, ...
-		var url = wdi.Utils.generateWebSocketUrl(
-			this._websockifyProtocol,
-			this._websockifyHost,
-			this._websockifyPort,
-			busData.host,
-			busData.port,
-			'raw',
-            this._vdiBusToken
-		);
-		var websocketProtocol = 'base64';
-		if (this.binary) {
-			websocketProtocol = 'binary';
-		}
-		this.ws.connect(url, websocketProtocol);
-
-		wdi.Debug.log("BusConnection: using protocol: " + websocketProtocol);
-
-		if (this.binary) {
-			this.ws.setBinaryType('arraybuffer');
-		}
-		this.setListeners();
-	},
-
-	disconnect: function() {
-		this.ws.close();
-		this.queue = '';
-		this.subscriptions = [];
-	},
-
-	setListeners: function() {
-		var self = this;
-		this.ws.onOpen(function(e) {
-			self._send("CONNECT\nlogin:" + self._busUser + "\npasscode:" + self._busPass + "\n\n\x00");
-		});
-
-		this.ws.onMessage(function(e) {
-			var message;
-			var result;
-			if (!self.binary) {
-				message = Base64.decodeStr(e.data);
-			} else {
-				message = String.fromCharCode.apply(null, new Uint8Array(e.data));
-				// Fix accented chars
-				// [ http://stackoverflow.com/questions/5396560/how-do-i-convert-special-utf-8-chars-to-their-iso-8859-1-equivalent-using-javasc ]
-				message = decodeURIComponent(escape(message));
-			}
-			var subChunks = message.split("\0");
-			if (subChunks.length == 1) {
-				// there is no \0 in the full message, add it to the queue
-				self.queue += subChunks[0];
-			} else {
-				// at least one \0, process all but the last subchunk (that has no \0)
-				for (var i = 0; i < subChunks.length - 1; i++) {
-					message = self.queue + subChunks[i];
-					result = self.parseMessage(message);
-					self.fire('busMessage', result);
-					self.queue = '';
-				}
-				// last chunk is now the queue
-				self.queue = subChunks[subChunks.length - 1];
-			}
-		});
-
-		this.ws.onClose(function(e) {
-			wdi.Debug.log('BusConnection CLOSED! connecting again in 1 second');
-			self.fire('error', e);
-		});
-
-		this.ws.onError(function(e) {
-			wdi.Debug.error('BusConnection ERROR:',  e);
-		});
-	},
-
-	parseMessage: function(message) {
-		try {
-			var arr = message.split("\n\n");
-			var header = arr[0].trim();
-			var body = arr[1].replace(/\x00/, '').trim();
-			if (body.length != 0) {
-				// there is content, so convert to object
-				body = JSON.parse(body);
-			} else {
-				body = null;
-			}
-			arr = header.split("\n");
-			var verb = arr.shift();
-			header = "{";
-			var len = arr.length;
-			for (var i = 0;i < len;i++) {
-				var headerName = arr[i].split(':')[0];
-				header += '"' + headerName + '":"' + arr[i].replace(headerName + ':', '') + '"';
-				if (i != len-1) {
-					header += ",";
-				}
-			}
-			header += "}";
-
-			return {'verb':verb, 'header':JSON.parse(header), 'body':body};
-		} catch (e) {
-			wdi.Debug.error("Error parsing Bus Info: ", e);
-			return {"verb":"ERROR"};
-		}
-	},
-
-	setSubscriptions: function() {
-		var len = this.subscriptions.length;
-		for (var i = 0; i < len;i++) {
-			this.subscribe(this.subscriptions[i]);
-		}
-	},
-
-	send: function(message) {
-		var destination = this.subscriptions[0];
-		this._send("SEND\ndestination:" + destination + "\ncontent-type:text/plain\n\n" + JSON.stringify(message) + "\x00");
-	},
-
-	subscribe: function(destination) {
-		//header browser: true for queue's to multiple subscribers
-		this._send("SUBSCRIBE\ndestination:" + destination + "\n\n\x00");
-	},
-
-	_send: function(message) {
-		if (!this.binary) {
-			this.ws.send(Base64.encodeStr(message));
-		} else {
-			this.ws.send(message);
-		}
-	}
-});
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.BusConnection = $.spcExtend(wdi.EventObject.prototype, {
+	ws: null,
+	subscriptions: [],
+	_busUser: null,
+	_busPass: null,
+	queue: '',
+	binary: false,
+
+	init: function(c) {
+		this.superInit();
+		this.ws = c.websocket || new wdi.WebSocketWrapper();
+		this.clusterNodeChooser = c.clusterNodeChooser || new wdi.ClusterNodeChooser();
+		this.binary = c.binary || false;
+	},
+
+	connect: function(c) {
+		if (!c['useBus']) {
+			wdi.Debug.warn("Not using the bus");
+			return;
+		}
+        this._vdiBusToken = c['vdiBusToken'];
+		if (!c['busHostList']) {
+			wdi.Debug.warn("Deprecated: using old busHost & busPort params");
+			c['busHostList'] = [{
+				host: c['busHost'],
+				port: c['busPort']
+			}];
+		}
+		this.clusterNodeChooser.setNodeList(c['busHostList']);
+		if (Modernizr['websocketsbinary']) {
+			this.binary = true;
+		}
+		this._busUser = c['busUser'];
+		this._busPass = c['busPass'];
+		this._websockifyProtocol = c['protocol'];
+		this._websockifyHost = c['host'];
+		this._websockifyPort = c['port'];
+		this.subscriptions = c['busSubscriptions'];
+
+		this._connectToNextHost();
+	},
+
+	_connectToNextHost: function () {
+		var busData = this.clusterNodeChooser.getAnother();
+
+		// c['protocol'] is the protocol we use to connect to websockify
+		// ie: ws, wss, https, ...
+		var url = wdi.Utils.generateWebSocketUrl(
+			this._websockifyProtocol,
+			this._websockifyHost,
+			this._websockifyPort,
+			busData.host,
+			busData.port,
+			'raw',
+            this._vdiBusToken
+		);
+		var websocketProtocol = 'base64';
+		if (this.binary) {
+			websocketProtocol = 'binary';
+		}
+		this.ws.connect(url, websocketProtocol);
+
+		wdi.Debug.log("BusConnection: using protocol: " + websocketProtocol);
+
+		if (this.binary) {
+			this.ws.setBinaryType('arraybuffer');
+		}
+		this.setListeners();
+	},
+
+	disconnect: function() {
+		this.ws.close();
+		this.queue = '';
+		this.subscriptions = [];
+	},
+
+	setListeners: function() {
+		var self = this;
+		this.ws.onOpen(function(e) {
+			self._send("CONNECT\nlogin:" + self._busUser + "\npasscode:" + self._busPass + "\n\n\x00");
+		});
+
+		this.ws.onMessage(function(e) {
+			var message;
+			var result;
+			if (!self.binary) {
+				message = Base64.decodeStr(e.data);
+			} else {
+				message = String.fromCharCode.apply(null, new Uint8Array(e.data));
+				// Fix accented chars
+				// [ http://stackoverflow.com/questions/5396560/how-do-i-convert-special-utf-8-chars-to-their-iso-8859-1-equivalent-using-javasc ]
+				message = decodeURIComponent(escape(message));
+			}
+			var subChunks = message.split("\0");
+			if (subChunks.length == 1) {
+				// there is no \0 in the full message, add it to the queue
+				self.queue += subChunks[0];
+			} else {
+				// at least one \0, process all but the last subchunk (that has no \0)
+				for (var i = 0; i < subChunks.length - 1; i++) {
+					message = self.queue + subChunks[i];
+					result = self.parseMessage(message);
+					self.fire('busMessage', result);
+					self.queue = '';
+				}
+				// last chunk is now the queue
+				self.queue = subChunks[subChunks.length - 1];
+			}
+		});
+
+		this.ws.onClose(function(e) {
+			wdi.Debug.log('BusConnection CLOSED! connecting again in 1 second');
+			self.fire('error', e);
+		});
+
+		this.ws.onError(function(e) {
+			wdi.Debug.error('BusConnection ERROR:',  e);
+		});
+	},
+
+	parseMessage: function(message) {
+		try {
+			var arr = message.split("\n\n");
+			var header = arr[0].trim();
+			var body = arr[1].replace(/\x00/, '').trim();
+			if (body.length != 0) {
+				// there is content, so convert to object
+				body = JSON.parse(body);
+			} else {
+				body = null;
+			}
+			arr = header.split("\n");
+			var verb = arr.shift();
+			header = "{";
+			var len = arr.length;
+			for (var i = 0;i < len;i++) {
+				var headerName = arr[i].split(':')[0];
+				header += '"' + headerName + '":"' + arr[i].replace(headerName + ':', '') + '"';
+				if (i != len-1) {
+					header += ",";
+				}
+			}
+			header += "}";
+
+			return {'verb':verb, 'header':JSON.parse(header), 'body':body};
+		} catch (e) {
+			wdi.Debug.error("Error parsing Bus Info: ", e);
+			return {"verb":"ERROR"};
+		}
+	},
+
+	setSubscriptions: function() {
+		var len = this.subscriptions.length;
+		for (var i = 0; i < len;i++) {
+			this.subscribe(this.subscriptions[i]);
+		}
+	},
+
+	send: function(message) {
+		var destination = this.subscriptions[0];
+		this._send("SEND\ndestination:" + destination + "\ncontent-type:text/plain\n\n" + JSON.stringify(message) + "\x00");
+	},
+
+	subscribe: function(destination) {
+		//header browser: true for queue's to multiple subscribers
+		this._send("SUBSCRIBE\ndestination:" + destination + "\n\n\x00");
+	},
+
+	_send: function(message) {
+		if (!this.binary) {
+			this.ws.send(Base64.encodeStr(message));
+		} else {
+			this.ws.send(message);
+		}
+	}
+});

package/public/spice-console/network/clusternodechooser.js

@@ -1,49 +1,49 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.ClusterNodeChooser = $.spcExtend(wdi.EventObject.prototype, {
-	init: function (c) {
-	},
-
-	setNodeList: function (nodeList) {
-		this._nodeList = this._shuffle(nodeList);
-		this._nodeListLength = this._nodeList.length;
-		this._currentIndex = 0;
-	},
-
-	getAnother: function () {
-		var toReturn = this._nodeList[this._currentIndex++ % this._nodeListLength];
-		return toReturn;
-	},
-
-	// recipe from: http://stackoverflow.com/a/6274398
-	_shuffle: function (list) {
-		var counter = list.length,
-			temp,
-			index;
-		while (counter > 0) {
-			index = Math.floor(Math.random() * counter);
-			counter--;
-			temp = list[counter];
-			list[counter] = list[index];
-			list[index] = temp;
-		}
-		return list;
-	}
-});
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.ClusterNodeChooser = $.spcExtend(wdi.EventObject.prototype, {
+	init: function (c) {
+	},
+
+	setNodeList: function (nodeList) {
+		this._nodeList = this._shuffle(nodeList);
+		this._nodeListLength = this._nodeList.length;
+		this._currentIndex = 0;
+	},
+
+	getAnother: function () {
+		var toReturn = this._nodeList[this._currentIndex++ % this._nodeListLength];
+		return toReturn;
+	},
+
+	// recipe from: http://stackoverflow.com/a/6274398
+	_shuffle: function (list) {
+		var counter = list.length,
+			temp,
+			index;
+		while (counter > 0) {
+			index = Math.floor(Math.random() * counter);
+			counter--;
+			temp = list[counter];
+			list[counter] = list[index];
+			list[index] = temp;
+		}
+		return list;
+	}
+});

package/public/spice-console/network/connectioncontrol.js

@@ -1,60 +1,60 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.ConnectionControl = $.spcExtend(wdi.EventObject.prototype, {
-	socket: null,
-	pendingTimeToConnectionLost: null,
-	previousTimeOut: null,
-
-	init: function(c) {
-		this.superInit();
-		this.socket = c.socket || new wdi.Socket();
-	},
-
-	connect: function(c) {
-		var url = wdi.Utils.generateWebSocketUrl(c.protocol, c.host, c.port, null, null,'raw', c.heartbeatToken);
-		this.socket.connect(url);
-		this.pendingTimeToConnectionLost = c.heartbeatTimeout;
-		wdi.Debug.log('ConnectionControl: connected');
-		this.setListeners();
-	},
-
-	disconnect: function() {
-		wdi.Debug.log('Connection Control disconnect');
-		if(this.previousTimeOut){
-			clearTimeout(this.previousTimeOut);
-		}
-		this.socket.disconnect();
-		this.socket = null;
-		this.pendingTimeToConnectionLost = null;
-		this.previousTimeOut = null;
-	},
-
-	setListeners: function() {
-		var self = this;
-		this.socket.setOnMessageCallback(function(e) {
-			wdi.Debug.log('ConectionControl: beat');
-			clearTimeout(self.previousTimeOut);
-			self.previousTimeOut = setTimeout(function() {
-				wdi.Debug.log('ConnectionControl: firing connectionLost event');
-				self.fire('connectionLost', e);
-			}, self.pendingTimeToConnectionLost);
-		});
-	}
-});
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.ConnectionControl = $.spcExtend(wdi.EventObject.prototype, {
+	socket: null,
+	pendingTimeToConnectionLost: null,
+	previousTimeOut: null,
+
+	init: function(c) {
+		this.superInit();
+		this.socket = c.socket || new wdi.Socket();
+	},
+
+	connect: function(c) {
+		var url = wdi.Utils.generateWebSocketUrl(c.protocol, c.host, c.port, null, null,'raw', c.heartbeatToken);
+		this.socket.connect(url);
+		this.pendingTimeToConnectionLost = c.heartbeatTimeout;
+		wdi.Debug.log('ConnectionControl: connected');
+		this.setListeners();
+	},
+
+	disconnect: function() {
+		wdi.Debug.log('Connection Control disconnect');
+		if(this.previousTimeOut){
+			clearTimeout(this.previousTimeOut);
+		}
+		this.socket.disconnect();
+		this.socket = null;
+		this.pendingTimeToConnectionLost = null;
+		this.previousTimeOut = null;
+	},
+
+	setListeners: function() {
+		var self = this;
+		this.socket.setOnMessageCallback(function(e) {
+			wdi.Debug.log('ConectionControl: beat');
+			clearTimeout(self.previousTimeOut);
+			self.previousTimeOut = setTimeout(function() {
+				wdi.Debug.log('ConnectionControl: firing connectionLost event');
+				self.fire('connectionLost', e);
+			}, self.pendingTimeToConnectionLost);
+		});
+	}
+});