From bf45db98a5217f034a449e6a92f2139cced0e6c7 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Thu, 5 Aug 2010 23:56:04 -0400 Subject: [PATCH] Fix listener response issues; add debug function to client-side. --- Makefile | 3 +- client/js/im.js | 41 ++++-- client/js/json.js | 261 +---------------------------------- server/middleware/im/user.js | 36 ++--- 4 files changed, 49 insertions(+), 292 deletions(-) diff --git a/Makefile b/Makefile index 0f9a8dd..e8cecea 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ imjs: ${IMJS} ${IMJS}: ${MODULES} @@echo "Building" ${IMJS} - @@cat ${MODULES} > ${IMJS} + @@cat ${MODULES} | sed 's/debug = true/debug = false/' > ${IMJS} min: ${IMJS_MIN} @@ -36,6 +36,7 @@ ${IMJS_MIN}: ${IMJS} @@head -21 ${IMJS} > ${IMJS_MIN} @@${COMPILER} --js ${IMJS} --warning_level QUIET >> ${IMJS_MIN} + @@rm -f ${IMJS} clean: @@echo "Removing built files" diff --git a/client/js/im.js b/client/js/im.js index dbf6db8..8bb8e93 100644 --- a/client/js/im.js +++ b/client/js/im.js @@ -201,6 +201,7 @@ $.extend(AjaxIM.prototype, { if(this.username) this.storage(); + this._lastReconnect = 0; this.listen(); }, @@ -259,6 +260,7 @@ $.extend(AjaxIM.prototype, { this.chats = {}; this.friends = {}; + this.chatstore = {}; $('.imjs-tab').not('.imjs-tab.imjs-default').remove(); $('.imjs-friend-group').not('.imjs-friend-group.imjs-default').remove(); @@ -282,7 +284,13 @@ $.extend(AjaxIM.prototype, { function(error) { self._notConnected(); $(self).trigger('pollFailed', ['not connected']); - // try reconnecting? + + // Try reconnecting in n*2 seconds (max 16) + self._reconnectIn = (self._lastReconnect < (new Date()) - 60000) + ? 1000 + : Math.min(self._reconnectIn * 2, 16000); + self._lastReconnect = new Date(); + setTimeout(function() { self.listen(); }, self._reconnectIn); } ); }, @@ -296,7 +304,7 @@ $.extend(AjaxIM.prototype, { switch(message.type) { case 'hello': this._clearSession(); - + this.username = message.username; store.set('user', message.username); $('#imjs-friends').removeClass('imjs-not-connected'); @@ -656,7 +664,6 @@ $.extend(AjaxIM.prototype, { }, _store: function(username, msg) { - console.log(msg); if(!msg.html.length) return; if(!this.chatstore) this.chatstore = {}; @@ -780,7 +787,7 @@ $.extend(AjaxIM.prototype, { $(self).trigger('sendMessageSuccessful', [username, body]); } else if(result.type == 'error') { - if(result.error == 'user offline') + if(result.error == 'not online') $(self).trigger('sendMessageFailed', ['offline', username, body]); else @@ -931,7 +938,8 @@ $.extend(AjaxIM.prototype, { // // //Note:// {{{this}}}, here, refers to the tab DOM element. activateTab: function(tab) { - var chatbox = tab.find('.imjs-chatbox') || false; + var chatbox = tab.find('.imjs-chatbox') || false, + input; if(tab.data('state') != 'active') { if(tab.attr('id') != 'imjs-friends') { @@ -976,7 +984,8 @@ $.extend(AjaxIM.prototype, { } if(chatbox) { - if(!(input = chatbox.find('.imjs-input')).data('height')) { + if((input = chatbox.find('.imjs-input')).length && + !input.data('height')) { if(!($.browser.msie && $.browser.opera)) input.height(0); if(input[0].scrollHeight > input.height() || input[0].scrollHeight < input.height()) { @@ -1187,7 +1196,8 @@ AjaxIM.get = function(url, data, successFunc, failureFunc) { }; AjaxIM.request = function(url, type, data, successFunc, failureFunc) { - if(typeof failureFunc != 'function'); + var errorTypes = ['timeout', 'error', 'notmodified', 'parseerror']; + if(typeof failureFunc != 'function') failureFunc = function(){}; $.ajax({ @@ -1198,12 +1208,14 @@ AjaxIM.request = function(url, type, data, successFunc, failureFunc) { cache: false, timeout: 299000, //callback: 'jsonp' + (new Date()).getTime(), - success: function(json, textStatus) { - console.log(json); + success: function(json, textStatus, xhr) { + if(xhr.status == '0') return; + _dbg(json); successFunc(json); }, - error: function(xhr, textStatus, error) { - failureFunc(error); + complete: function(xhr, textStatus) { + if(~errorTypes.indexOf(textStatus) || xhr.status == '0') + failureFunc(textStatus); } }); @@ -1265,4 +1277,9 @@ AjaxIM.l10n = { notConnected: 'You are currently not connected or the server is not available. ' + 'Please ensure that you are signed in and try again.', notConnectedTip: 'You are currently not connected.' -}; \ No newline at end of file +}; + +AjaxIM.debug = true; +function _dbg(msg) { + if(AjaxIM.debug && window.console) console.log(msg); +} diff --git a/client/js/json.js b/client/js/json.js index a1a3b17..ee9f4e1 100644 --- a/client/js/json.js +++ b/client/js/json.js @@ -1,164 +1,8 @@ /* http://www.JSON.org/json2.js 2010-03-20 - Public Domain. - - NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. - - See http://www.JSON.org/js.html - - - This code should be minified before deployment. - See http://javascript.crockford.com/jsmin.html - - USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO - NOT CONTROL. - - - This file creates a global JSON object containing two methods: stringify - and parse. - - JSON.stringify(value, replacer, space) - value any JavaScript value, usually an object or array. - - replacer an optional parameter that determines how object - values are stringified for objects. It can be a - function or an array of strings. - - space an optional parameter that specifies the indentation - of nested structures. If it is omitted, the text will - be packed without extra whitespace. If it is a number, - it will specify the number of spaces to indent at each - level. If it is a string (such as '\t' or ' '), - it contains the characters used to indent at each level. - - This method produces a JSON text from a JavaScript value. - - When an object value is found, if the object contains a toJSON - method, its toJSON method will be called and the result will be - stringified. A toJSON method does not serialize: it returns the - value represented by the name/value pair that should be serialized, - or undefined if nothing should be serialized. The toJSON method - will be passed the key associated with the value, and this will be - bound to the value - - For example, this would serialize Dates as ISO strings. - - Date.prototype.toJSON = function (key) { - function f(n) { - // Format integers to have at least two digits. - return n < 10 ? '0' + n : n; - } - - return this.getUTCFullYear() + '-' + - f(this.getUTCMonth() + 1) + '-' + - f(this.getUTCDate()) + 'T' + - f(this.getUTCHours()) + ':' + - f(this.getUTCMinutes()) + ':' + - f(this.getUTCSeconds()) + 'Z'; - }; - - You can provide an optional replacer method. It will be passed the - key and value of each member, with this bound to the containing - object. The value that is returned from your method will be - serialized. If your method returns undefined, then the member will - be excluded from the serialization. - - If the replacer parameter is an array of strings, then it will be - used to select the members to be serialized. It filters the results - such that only members with keys listed in the replacer array are - stringified. - - Values that do not have JSON representations, such as undefined or - functions, will not be serialized. Such values in objects will be - dropped; in arrays they will be replaced with null. You can use - a replacer function to replace those with JSON values. - JSON.stringify(undefined) returns undefined. - - The optional space parameter produces a stringification of the - value that is filled with line breaks and indentation to make it - easier to read. - - If the space parameter is a non-empty string, then that string will - be used for indentation. If the space parameter is a number, then - the indentation will be that many spaces. - - Example: - - text = JSON.stringify(['e', {pluribus: 'unum'}]); - // text is '["e",{"pluribus":"unum"}]' - - - text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t'); - // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' - - text = JSON.stringify([new Date()], function (key, value) { - return this[key] instanceof Date ? - 'Date(' + this[key] + ')' : value; - }); - // text is '["Date(---current time---)"]' - - - JSON.parse(text, reviver) - This method parses a JSON text to produce an object or array. - It can throw a SyntaxError exception. - - The optional reviver parameter is a function that can filter and - transform the results. It receives each of the keys and values, - and its return value is used instead of the original value. - If it returns what it received, then the structure is not modified. - If it returns undefined then the member is deleted. - - Example: - - // Parse the text. Values that look like ISO date strings will - // be converted to Date objects. - - myData = JSON.parse(text, function (key, value) { - var a; - if (typeof value === 'string') { - a = -/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); - if (a) { - return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], - +a[5], +a[6])); - } - } - return value; - }); - - myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) { - var d; - if (typeof value === 'string' && - value.slice(0, 5) === 'Date(' && - value.slice(-1) === ')') { - d = new Date(value.slice(5, -1)); - if (d) { - return d; - } - } - return value; - }); - - - This is a reference implementation. You are free to copy, modify, or - redistribute. */ - -/*jslint evil: true, strict: false */ - -/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply, - call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, - getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, - lastIndex, length, parse, prototype, push, replace, slice, stringify, - test, toJSON, toString, valueOf -*/ - - -// Create a JSON object only if one does not already exist. We create the -// methods in a closure to avoid creating global variables. - if (!this.JSON) { this.JSON = {}; } @@ -207,12 +51,6 @@ if (!this.JSON) { function quote(string) { - -// If the string contains no control characters, no quote characters, and no -// backslash characters, then we can safely slap some quotes around it. -// Otherwise we must also replace the offending characters with safe escape -// sequences. - escapable.lastIndex = 0; return escapable.test(string) ? '"' + string.replace(escapable, function (a) { @@ -225,84 +63,48 @@ if (!this.JSON) { function str(key, holder) { - -// Produce a string from holder[key]. - - var i, // The loop counter. - k, // The member key. - v, // The member value. + var i, + k, + v, length, mind = gap, partial, value = holder[key]; -// If the value has a toJSON method, call it to obtain a replacement value. - if (value && typeof value === 'object' && typeof value.toJSON === 'function') { value = value.toJSON(key); } -// If we were called with a replacer function, then call the replacer to -// obtain a replacement value. - if (typeof rep === 'function') { value = rep.call(holder, key, value); } -// What happens next depends on the value's type. - switch (typeof value) { case 'string': return quote(value); case 'number': - -// JSON numbers must be finite. Encode non-finite numbers as null. - return isFinite(value) ? String(value) : 'null'; case 'boolean': case 'null': - -// If the value is a boolean or null, convert it to a string. Note: -// typeof null does not produce 'null'. The case is included here in -// the remote chance that this gets fixed someday. - return String(value); -// If the type is 'object', we might be dealing with an object or an array or -// null. - case 'object': - -// Due to a specification blunder in ECMAScript, typeof null is 'object', -// so watch out for that case. - if (!value) { return 'null'; } -// Make an array to hold the partial results of stringifying this object value. - gap += indent; partial = []; -// Is the value an array? - if (Object.prototype.toString.apply(value) === '[object Array]') { - -// The value is an array. Stringify every element. Use null as a placeholder -// for non-JSON values. - length = value.length; for (i = 0; i < length; i += 1) { partial[i] = str(i, value) || 'null'; } -// Join all of the elements together, separated with commas, and wrap them in -// brackets. - v = partial.length === 0 ? '[]' : gap ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + @@ -312,8 +114,6 @@ if (!this.JSON) { return v; } -// If the replacer is an array, use it to select the members to be stringified. - if (rep && typeof rep === 'object') { length = rep.length; for (i = 0; i < length; i += 1) { @@ -326,9 +126,6 @@ if (!this.JSON) { } } } else { - -// Otherwise, iterate through all of the keys in the object. - for (k in value) { if (Object.hasOwnProperty.call(value, k)) { v = str(k, value); @@ -365,23 +162,15 @@ if (!this.JSON) { gap = ''; indent = ''; -// If the space parameter is a number, make an indent string containing that -// many spaces. - if (typeof space === 'number') { for (i = 0; i < space; i += 1) { indent += ' '; } -// If the space parameter is a string, it will be used as the indent string. - } else if (typeof space === 'string') { indent = space; } -// If there is a replacer, it must be a function or an array. -// Otherwise, throw an error. - rep = replacer; if (replacer && typeof replacer !== 'function' && (typeof replacer !== 'object' || @@ -389,29 +178,15 @@ if (!this.JSON) { throw new Error('JSON.stringify'); } -// Make a fake root object containing our value under the key of ''. -// Return the result of stringifying the value. - return str('', {'': value}); }; } - -// If the JSON object does not yet have a parse method, give it one. - if (typeof JSON.parse !== 'function') { JSON.parse = function (text, reviver) { - -// The parse method takes a text and an optional reviver function, and returns -// a JavaScript value if the text is a valid JSON text. - var j; function walk(holder, key) { - -// The walk method is used to recursively walk the resulting structure so -// that modifications can be made. - var k, v, value = holder[key]; if (value && typeof value === 'object') { for (k in value) { @@ -428,11 +203,6 @@ if (!this.JSON) { return reviver.call(holder, key, value); } - -// Parsing happens in four stages. In the first stage, we replace certain -// Unicode characters with escape sequences. JavaScript handles many characters -// incorrectly, either silently deleting them, or treating them as line endings. - text = String(text); cx.lastIndex = 0; if (cx.test(text)) { @@ -442,40 +212,15 @@ if (!this.JSON) { }); } -// In the second stage, we run the text against regular expressions that look -// for non-JSON patterns. We are especially concerned with '()' and 'new' -// because they can cause invocation, and '=' because it can cause mutation. -// But just to be safe, we want to reject all unexpected forms. - -// We split the second stage into 4 regexp operations in order to work around -// crippling inefficiencies in IE's and Safari's regexp engines. First we -// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we -// replace all simple value tokens with ']' characters. Third, we delete all -// open brackets that follow a colon or comma or that begin the text. Finally, -// we look to see that the remaining characters are only whitespace or ']' or -// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval. - if (/^[\],:{}\s]*$/. test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@'). replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']'). replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) { - -// In the third stage we use the eval function to compile the text into a -// JavaScript structure. The '{' operator is subject to a syntactic ambiguity -// in JavaScript: it can begin a block or an object literal. We wrap the text -// in parens to eliminate the ambiguity. - j = eval('(' + text + ')'); - -// In the optional fourth stage, we recursively walk the new structure, passing -// each name/value pair to a reviver function for possible transformation. - return typeof reviver === 'function' ? walk({'': j}, '') : j; } -// If the text is not JSON parseable, then a SyntaxError is thrown. - throw new SyntaxError('JSON.parse'); }; } diff --git a/server/middleware/im/user.js b/server/middleware/im/user.js index fd338ab..7751861 100644 --- a/server/middleware/im/user.js +++ b/server/middleware/im/user.js @@ -31,14 +31,15 @@ User.prototype._friends = function(friends) { User.prototype._expireConns = function() { var conn, - noop = JSON.stringify({type: 'noop'}); + noop = JSON.stringify({type: 'noop'}), + noop_headers = { + 'Content-Type': 'application/json', + 'Content-Length': noop.length + }; for(var i = 0; i < this.listeners.length; i++) { conn = this.listeners[i].connection; if((Date.now() - conn._idleStart) >= conn._idleTimeout - 2000) { - this.listeners[i].writeHead(200, { - 'Content-Type': 'application/json', - 'Content-Length': noop.length - }); + this.listeners[i].writeHead(200, noop_headers); this.listeners[i].end(noop); this.listeners.splice(i, 1); i--; @@ -78,23 +79,16 @@ User.prototype._send = function(type, code, message, callback) { if(!this.listeners.length) return this.message_queue.push(arguments); - var notify_run, cx = this.listeners.slice(); + var cx = this.listeners.slice(), conn; this.listeners = []; - (notify_run = function(conn) { - return function() { - if(!conn) { - if(callback) callback(); - return; - } - - conn.writeHead(code || 200, { - 'Content-Type': 'application/json', - 'Content-Length': message.length - }); - conn.end(message); - notify_run(cx.shift()); - }; - })(cx.shift())(); + while(conn = cx.shift()) { + conn.writeHead(code || 200, { + 'Content-Type': 'application/json', + 'Content-Length': message.length + }); + conn.end(message); + } + if(callback) callback(); } };