bfg-common 1.2.85 → 1.2.87

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

@@ -1,86 +1,86 @@
-/*
-    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.SizeDefiner = $.spcExtend(wdi.DomainObject, {
-	ERROR_CODE_SIZE: 4,
-	status: null,
-	STATUS_READY: 0,
-	STATUS_REPLY: 1,
-	STATUS_REPLY_BODY: 2,
-	STATUS_ERROR_CODE: 3,
-	STATUS_MESSAGE: 4,
-	STATUS_HEADER: 5,
-	STATUS_BODY: 6,
-	isHeader: false,
-
-	init: function(c) {
-		this.status = this.STATUS_READY;
-	},
-
-	getSize: function(arr) {
-		if (this.STATUS_READY === this.status) {
-			this.status++;
-			return wdi.SpiceLinkHeader.prototype.objectSize;
-		} else if (this.STATUS_REPLY === this.status) {
-			this.status++;
-			return this.getReplyBodySize(arr);
-		} else if (this.STATUS_REPLY_BODY === this.status) {
-			this.status++;
-			return this.ERROR_CODE_SIZE;
-		} else if (this.STATUS_ERROR_CODE === this.status) {
-			this.status++;
-			this.isHeader = true;
-			return 6; //wdi.SpiceDataHeader.prototype.objectSize access here is slow
-		} else {
-			if (this.isHeader) {
-				this.isHeader = false;
-				return this.getBodySizeFromArrayHeader(arr);
-			} else {
-				this.isHeader = true;
-				return 6;//wdi.SpiceDataHeader.prototype.objectSize; access here is slow
-			}
-		}
-	},
-
-	getReplyBodySize: function (arr) {
-		var queue = wdi.GlobalPool.create('ViewQueue');
-		queue.setData(arr);
-		var header = new wdi.SpiceLinkHeader().demarshall(queue);
-		wdi.GlobalPool.discard('ViewQueue', queue);
-		return header.size;
-	},
-
-	getBodySizeFromArrayHeader: function (arr) {
-		var queue = wdi.GlobalPool.create('ViewQueue');
-		queue.setData(arr);
-		var header = new wdi.SpiceDataHeader().demarshall(queue);
-		wdi.GlobalPool.discard('ViewQueue', queue);
-		return header.size;
-	},
-
-	getStatus: function() {
-		if (this.status === this.STATUS_MESSAGE && this.isHeader) {
-			return this.STATUS_HEADER;
-		} else if (this.status === this.STATUS_MESSAGE && !this.isHeader) {
-			return this.STATUS_BODY;
-		} else {
-			return this.status;
-		}
-	}
-});
+/*
+    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.SizeDefiner = $.spcExtend(wdi.DomainObject, {
+	ERROR_CODE_SIZE: 4,
+	status: null,
+	STATUS_READY: 0,
+	STATUS_REPLY: 1,
+	STATUS_REPLY_BODY: 2,
+	STATUS_ERROR_CODE: 3,
+	STATUS_MESSAGE: 4,
+	STATUS_HEADER: 5,
+	STATUS_BODY: 6,
+	isHeader: false,
+
+	init: function(c) {
+		this.status = this.STATUS_READY;
+	},
+
+	getSize: function(arr) {
+		if (this.STATUS_READY === this.status) {
+			this.status++;
+			return wdi.SpiceLinkHeader.prototype.objectSize;
+		} else if (this.STATUS_REPLY === this.status) {
+			this.status++;
+			return this.getReplyBodySize(arr);
+		} else if (this.STATUS_REPLY_BODY === this.status) {
+			this.status++;
+			return this.ERROR_CODE_SIZE;
+		} else if (this.STATUS_ERROR_CODE === this.status) {
+			this.status++;
+			this.isHeader = true;
+			return 6; //wdi.SpiceDataHeader.prototype.objectSize access here is slow
+		} else {
+			if (this.isHeader) {
+				this.isHeader = false;
+				return this.getBodySizeFromArrayHeader(arr);
+			} else {
+				this.isHeader = true;
+				return 6;//wdi.SpiceDataHeader.prototype.objectSize; access here is slow
+			}
+		}
+	},
+
+	getReplyBodySize: function (arr) {
+		var queue = wdi.GlobalPool.create('ViewQueue');
+		queue.setData(arr);
+		var header = new wdi.SpiceLinkHeader().demarshall(queue);
+		wdi.GlobalPool.discard('ViewQueue', queue);
+		return header.size;
+	},
+
+	getBodySizeFromArrayHeader: function (arr) {
+		var queue = wdi.GlobalPool.create('ViewQueue');
+		queue.setData(arr);
+		var header = new wdi.SpiceDataHeader().demarshall(queue);
+		wdi.GlobalPool.discard('ViewQueue', queue);
+		return header.size;
+	},
+
+	getStatus: function() {
+		if (this.status === this.STATUS_MESSAGE && this.isHeader) {
+			return this.STATUS_HEADER;
+		} else if (this.status === this.STATUS_MESSAGE && !this.isHeader) {
+			return this.STATUS_BODY;
+		} else {
+			return this.status;
+		}
+	}
+});

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

@@ -1,120 +1,120 @@
-/*
-    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.socketStatus = {
-	'idle':0,
-	'prepared':1,
-	'connected':2,
-	'disconnected':3,
-	'failed':4
-};
-//Works only with arrays of bytes (this means each value is a number in 0 to 255)
-wdi.Socket = $.spcExtend(wdi.EventObject.prototype, {
-	websocket: null,
-	status: wdi.socketStatus.idle,
-	binary: false,
-	
-	connect: function(uri) {
-		var self = this;
-		var protocol = 'base64'; //default protocol
-		
-		if(Modernizr['websocketsbinary']) {
-			protocol = 'binary';
-			this.binary = true;
-		}
-
-		this.websocket = new WebSocket(uri, protocol);
-
-		wdi.Debug.log("Socket: using protocol: "+protocol);
-		
-		if(this.binary) {
-			this.websocket.binaryType = 'arraybuffer';
-		}
-		
-		this.status = wdi.socketStatus.prepared;
-		this.websocket.onopen = function() {
-			self.status = wdi.socketStatus.connected;
-			self.fire('open');
-		};
-		this.websocket.onmessage = function(e) {
-			self.fire('message', e.data);
-		};
-		this.websocket.onclose = function(e) {
-			self.status = wdi.socketStatus.disconnected;
-			console.warn('Spice Web Client: ', e.code, e.reason);
-			self.disconnect();
-			self.fire('close', e);
-		};
-		this.websocket.onerror = function(e) {
-			self.status = wdi.socketStatus.failed;
-			self.fire('error', e);
-		};
-	},
-
-	setOnMessageCallback: function(callback) {
-		this.websocket.onmessage = callback;
-	},
-	
-	send: function(message) {
-		try {
-			this.websocket.send(this.encode_message(message));
-		} catch (err) {
-			this.status = wdi.socketStatus.failed;
-			this.fire('error', err);
-		}
-	},
-	
-	disconnect: function() {
-		if (this.websocket) {
-			this.websocket.onopen = function() {};
-			this.websocket.onmessage = function() {};
-			this.websocket.onclose = function() {};
-			this.websocket.onerror = function() {};
-			this.websocket.close();
-			this.status = wdi.socketStatus.idle;
-			this.binary = false;
-			this.websocket = null;
-		}
-	},
-	
-	setStatus: function(status) {
-		this.status = status;
-		this.fire('status', status);
-	},
-	
-	getStatus: function() {
-		return this.status;
-	},
-	
-	encode_message: function(mess) {
-		if(!this.binary) {
-			var arr = Base64.encode(mess);
-			return arr;
-		} 
-		
-		var len = mess.length;
-		
-		var buffer = new ArrayBuffer(len);
-		var u8 = new Uint8Array(buffer);
-		
-		u8.set(mess);
-	
-		return u8;
-	}
-});
+/*
+    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.socketStatus = {
+	'idle':0,
+	'prepared':1,
+	'connected':2,
+	'disconnected':3,
+	'failed':4
+};
+//Works only with arrays of bytes (this means each value is a number in 0 to 255)
+wdi.Socket = $.spcExtend(wdi.EventObject.prototype, {
+	websocket: null,
+	status: wdi.socketStatus.idle,
+	binary: false,
+	
+	connect: function(uri) {
+		var self = this;
+		var protocol = 'base64'; //default protocol
+		
+		if(Modernizr['websocketsbinary']) {
+			protocol = 'binary';
+			this.binary = true;
+		}
+
+		this.websocket = new WebSocket(uri, protocol);
+
+		wdi.Debug.log("Socket: using protocol: "+protocol);
+		
+		if(this.binary) {
+			this.websocket.binaryType = 'arraybuffer';
+		}
+		
+		this.status = wdi.socketStatus.prepared;
+		this.websocket.onopen = function() {
+			self.status = wdi.socketStatus.connected;
+			self.fire('open');
+		};
+		this.websocket.onmessage = function(e) {
+			self.fire('message', e.data);
+		};
+		this.websocket.onclose = function(e) {
+			self.status = wdi.socketStatus.disconnected;
+			console.warn('Spice Web Client: ', e.code, e.reason);
+			self.disconnect();
+			self.fire('close', e);
+		};
+		this.websocket.onerror = function(e) {
+			self.status = wdi.socketStatus.failed;
+			self.fire('error', e);
+		};
+	},
+
+	setOnMessageCallback: function(callback) {
+		this.websocket.onmessage = callback;
+	},
+	
+	send: function(message) {
+		try {
+			this.websocket.send(this.encode_message(message));
+		} catch (err) {
+			this.status = wdi.socketStatus.failed;
+			this.fire('error', err);
+		}
+	},
+	
+	disconnect: function() {
+		if (this.websocket) {
+			this.websocket.onopen = function() {};
+			this.websocket.onmessage = function() {};
+			this.websocket.onclose = function() {};
+			this.websocket.onerror = function() {};
+			this.websocket.close();
+			this.status = wdi.socketStatus.idle;
+			this.binary = false;
+			this.websocket = null;
+		}
+	},
+	
+	setStatus: function(status) {
+		this.status = status;
+		this.fire('status', status);
+	},
+	
+	getStatus: function() {
+		return this.status;
+	},
+	
+	encode_message: function(mess) {
+		if(!this.binary) {
+			var arr = Base64.encode(mess);
+			return arr;
+		} 
+		
+		var len = mess.length;
+		
+		var buffer = new ArrayBuffer(len);
+		var u8 = new Uint8Array(buffer);
+		
+		u8.set(mess);
+	
+		return u8;
+	}
+});

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

@@ -1,95 +1,95 @@
-/*
-    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.SocketQueue = $.spcExtend(wdi.EventObject.prototype, {
-	rQ: null,
-	sQ: null,
-	socket: null,
-
-	init: function(c) {
-		this.superInit();
-		this.socket = c.socket || new wdi.Socket();
-		this.rQ = c.rQ || new wdi.FixedQueue();
-		this.sQ = c.sQ || new wdi.Queue();
-		this.setup();
-	},
-
-	setup: function() {
-		this.socket.addListener('open', function() {
-			this.fire('open');
-		}, this);
-		this.socket.addListener('message', function(data) {
-			this.rQ.push(new Uint8Array(data));
-			this.fire('message');
-		}, this);
-		this.socket.addListener('close', function(e) {
-			this.fire('close', e);
-		}, this);
-		this.socket.addListener('error', function(e) {
-			this.fire('error', e);
-		}, this);
-	},
-
-	getStatus: function() {
-		return this.socket.getStatus();
-	},
-
-	connect: function(uri) {
-		this.socket.connect(uri);
-	},
-
-	disconnect: function() {
-		wdi.Debug.log('socket Queue disconnect');
-		if (this.socket) {
-			this.socket.clearEvents();
-			this.socket.disconnect();
-		}
-		this.rQ = null;
-		this.sQ = null;
-		this.socket = null;
-	},
-
-	send: function(data, shouldFlush) {
-		//check for shouldFlush parameter, by default is true
-		if (shouldFlush === undefined) {
-			var flush = true;
-		} else {
-			var flush = shouldFlush;
-		}
-
-		//performance: avoid passing through the queue if there is no queue and
-		//we have flush!
-		if(this.sQ && this.sQ.getLength() === 0 && flush) {
-			this.socket.send(data);
-			return;
-		}
-
-		//normal operation, append to buffer and send if flush
-
-		if (this.sQ) {
-			this.sQ.push(data);
-			if (flush) this.flush();
-		}
-	},
-
-	flush: function() {
-		var data = this.sQ.shift();
-		this.socket.send(data);
-	}
-});
+/*
+    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.SocketQueue = $.spcExtend(wdi.EventObject.prototype, {
+	rQ: null,
+	sQ: null,
+	socket: null,
+
+	init: function(c) {
+		this.superInit();
+		this.socket = c.socket || new wdi.Socket();
+		this.rQ = c.rQ || new wdi.FixedQueue();
+		this.sQ = c.sQ || new wdi.Queue();
+		this.setup();
+	},
+
+	setup: function() {
+		this.socket.addListener('open', function() {
+			this.fire('open');
+		}, this);
+		this.socket.addListener('message', function(data) {
+			this.rQ.push(new Uint8Array(data));
+			this.fire('message');
+		}, this);
+		this.socket.addListener('close', function(e) {
+			this.fire('close', e);
+		}, this);
+		this.socket.addListener('error', function(e) {
+			this.fire('error', e);
+		}, this);
+	},
+
+	getStatus: function() {
+		return this.socket.getStatus();
+	},
+
+	connect: function(uri) {
+		this.socket.connect(uri);
+	},
+
+	disconnect: function() {
+		wdi.Debug.log('socket Queue disconnect');
+		if (this.socket) {
+			this.socket.clearEvents();
+			this.socket.disconnect();
+		}
+		this.rQ = null;
+		this.sQ = null;
+		this.socket = null;
+	},
+
+	send: function(data, shouldFlush) {
+		//check for shouldFlush parameter, by default is true
+		if (shouldFlush === undefined) {
+			var flush = true;
+		} else {
+			var flush = shouldFlush;
+		}
+
+		//performance: avoid passing through the queue if there is no queue and
+		//we have flush!
+		if(this.sQ && this.sQ.getLength() === 0 && flush) {
+			this.socket.send(data);
+			return;
+		}
+
+		//normal operation, append to buffer and send if flush
+
+		if (this.sQ) {
+			this.sQ.push(data);
+			if (flush) this.flush();
+		}
+	},
+
+	flush: function() {
+		var data = this.sQ.shift();
+		this.socket.send(data);
+	}
+});