Browse Source

lint

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
dd53ceebe4
  1. 14
      lib/stream.js
  2. 9
      lib/string_decoder.js
  3. 5
      lib/sys.js
  4. 10
      lib/timers.js
  5. 19
      lib/tls.js
  6. 82
      lib/util.js

14
lib/stream.js

@ -16,13 +16,13 @@ Stream.prototype.pipe = function (dest, options) {
}
}
source.on("data", ondata);
source.on('data', ondata);
function ondrain() {
if (source.readable) source.resume();
}
dest.on("drain", ondrain);
dest.on('drain', ondrain);
/*
* If the 'end' option is not supplied, dest.end() will be called when
@ -34,7 +34,7 @@ Stream.prototype.pipe = function (dest, options) {
dest.end();
}
source.on("end", onend);
source.on('end', onend);
}
dest.on('close', function() {
@ -50,21 +50,21 @@ Stream.prototype.pipe = function (dest, options) {
if (!source.pause) {
source.pause = function() {
source.emit("pause");
source.emit('pause');
};
}
if (!source.resume) {
source.resume = function() {
source.emit("resume");
source.emit('resume');
};
}
dest.on("pause", function () {
dest.on('pause', function() {
source.pause();
});
dest.on("resume", function () {
dest.on('resume', function() {
if (source.readable) source.resume();
});
};

9
lib/string_decoder.js

@ -18,9 +18,9 @@ StringDecoder.prototype.write = function (buffer) {
// if our last write ended with an incomplete multibyte character
if (this.charLength) {
// determine how many remaining bytes this buffer has to offer for this char
var i = (buffer.length >= this.charLength - this.charReceived)
? this.charLength - this.charReceived
: buffer.length;
var i = (buffer.length >= this.charLength - this.charReceived) ?
this.charLength - this.charReceived :
buffer.length;
// add the new bytes to the char buffer
buffer.copy(this.charBuffer, this.charReceived, 0, i);
@ -46,7 +46,8 @@ StringDecoder.prototype.write = function (buffer) {
// determine how many bytes we have to check at the end of this buffer
var i = (buffer.length >= 3) ? 3 : buffer.length;
// figure out if one of the last i bytes of our buffer announces an incomplete char
// Figure out if one of the last i bytes of our buffer announces an
// incomplete char.
for (; i > 0; i--) {
c = buffer[buffer.length - i];

5
lib/sys.js

@ -1,8 +1,9 @@
var util = require("util");
var util = require('util');
var sysWarning;
if (!sysWarning) {
sysWarning = "The 'sys' module is now called 'util'. It should have a similar interface.";
sysWarning = 'The "sys" module is now called "util". ' +
'It should have a similar interface.';
// Uncomment in 2011
//util.error(sysWarning);
}

10
lib/timers.js

@ -5,12 +5,14 @@ var assert = process.assert;
* To enable debug statements for the timers do NODE_DEBUG=8 ./node script.js
*/
var debugLevel = parseInt(process.env.NODE_DEBUG, 16);
function debug () {
var debug;
if (debugLevel & 0x8) {
require('util').error.apply(this, arguments);
}
debug = function() { require('util').error.apply(this, arguments); };
} else {
debug = function() { };
}
// IDLE TIMEOUTS
//
// Because often many sockets will have the same idle timeout we will not
@ -79,7 +81,7 @@ function insert (item, msecs) {
// TODO - don't stop and start the watcher all the time.
// just set its repeat
var now = new Date();
debug("now: " + now);
debug('now: ' + now);
var first;
while (first = peek(list)) {
var diff = now - first._idleStart;

19
lib/tls.js

@ -38,10 +38,10 @@ var inherits = require('util').inherits;
// cleartext.getCertificate() (by mirroring from pair.credentials.context)
function Server(/* [options], listener */) {
var options, listener;
if (typeof arguments[0] == "object") {
if (typeof arguments[0] == 'object') {
options = arguments[0];
listener = arguments[1];
} else if (typeof arguments[0] == "function") {
} else if (typeof arguments[0] == 'function') {
options = {};
listener = arguments[0];
}
@ -52,9 +52,8 @@ function Server ( /* [options], listener */) {
// constructor call
net.Server.call(this, function(socket) {
var creds = crypto.createCredentials({ key: self.key,
cert: self.cert,
ca: self.ca });
var creds = crypto.createCredentials(
{ key: self.key, cert: self.cert, ca: self.ca });
creds.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
var pair = crypto.createPair(creds,
@ -70,7 +69,7 @@ function Server ( /* [options], listener */) {
if (self.unauthorizedPeers) {
self.emit('unauthorized', pair.cleartext, verifyError);
} else {
console.error("REJECT PEER. verify error: %s", verifyError);
console.error('REJECT PEER. verify error: %s', verifyError);
socket.destroy();
}
} else {
@ -80,13 +79,7 @@ function Server ( /* [options], listener */) {
pair.on('error', function(e) {
console.log('pair got error: ' + e);
// TODO better way to get error code.
if (/no shared cipher/.test(e.message)) {
;
} else {
self.emit('error', e);
}
});
pair.cleartext.on('error', function(err) {
@ -116,7 +109,7 @@ exports.createServer = function (options, listener) {
Server.prototype.setOptions = function(options) {
if (typeof options.unauthorizedPeers == "boolean") {
if (typeof options.unauthorizedPeers == 'boolean') {
this.unauthorizedPeers = options.unauthorizedPeers;
} else {
this.unauthorizedPeers = false;

82
lib/util.js

@ -16,7 +16,7 @@ exports.puts = function () {
exports.debug = function(x) {
process.binding('stdio').writeError("DEBUG: " + x + "\n");
process.binding('stdio').writeError('DEBUG: ' + x + '\n');
};
@ -31,7 +31,7 @@ var error = exports.error = function (x) {
* Echos the value of a value. Trys to print the value out
* in the best way possible given the different types.
*
* @param {Object} value The object to print out
* @param {Object} value The object to print out.
* @param {Boolean} showHidden Flag that shows hidden (not enumerable)
* properties of objects.
* @param {Number} depth Depth in which to descend in object. Default is 2.
@ -57,15 +57,15 @@ exports.inspect = function (obj, showHidden, depth, colors) {
, 'red' : [31, 39]
, 'yellow' : [33, 39]
};
var style = { "special": "grey"
, "number": "blue"
, "boolean": "blue"
, "undefined": "red"
, "null": "red"
, "string": "green"
, "date": "magenta"
var style = { 'special': 'grey'
, 'number': 'blue'
, 'boolean': 'blue'
, 'undefined': 'red'
, 'null': 'red'
, 'string': 'green'
, 'date': 'magenta'
//, "name": intentionally not styling
, "regexp": "cyan"
, 'regexp': 'cyan'
}[styleType];
if (style) {
return '\033[' + styles[style][0] + 'm' + str +
@ -127,17 +127,17 @@ exports.inspect = function (obj, showHidden, depth, colors) {
// Determine the object type
if (isArray(value)) {
type = 'Array';
braces = ["[", "]"];
braces = ['[', ']'];
} else {
type = 'Object';
braces = ["{", "}"];
braces = ['{', '}'];
}
// Make functions say that they are functions
if (typeof value === 'function') {
base = (isRegExp(value)) ? ' ' + value : ' [Function' + (value.name ? ': ' + value.name : '') + ']';
} else {
base = "";
base = '';
}
// Make dates with properties first say the date
@ -151,9 +151,9 @@ exports.inspect = function (obj, showHidden, depth, colors) {
if (recurseTimes < 0) {
if (isRegExp(value)) {
return stylize('' + value, "regexp");
return stylize('' + value, 'regexp');
} else {
return stylize("[Object]", "special");
return stylize('[Object]', 'special');
}
}
@ -164,18 +164,18 @@ exports.inspect = function (obj, showHidden, depth, colors) {
if (value.__lookupGetter__) {
if (value.__lookupGetter__(key)) {
if (value.__lookupSetter__(key)) {
str = stylize("[Getter/Setter]", "special");
str = stylize('[Getter/Setter]', 'special');
} else {
str = stylize("[Getter]", "special");
str = stylize('[Getter]', 'special');
}
} else {
if (value.__lookupSetter__(key)) {
str = stylize("[Setter]", "special");
str = stylize('[Setter]', 'special');
}
}
}
if (visible_keys.indexOf(key) < 0) {
name = "[" + key + "]";
name = '[' + key + ']';
}
if (!str) {
if (seen.indexOf(value[key]) < 0) {
@ -206,16 +206,16 @@ exports.inspect = function (obj, showHidden, depth, colors) {
name = JSON.stringify('' + key);
if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
name = name.substr(1, name.length - 2);
name = stylize(name, "name");
name = stylize(name, 'name');
} else {
name = name.replace(/'/g, "\\'")
.replace(/\\"/g, '"')
.replace(/(^"|"$)/g, "'");
name = stylize(name, "string");
name = stylize(name, 'string');
}
}
return name + ": " + str;
return name + ': ' + str;
});
seen.pop();
@ -235,8 +235,8 @@ exports.inspect = function (obj, showHidden, depth, colors) {
+ ' '
+ output.join(',\n ')
+ ' '
+ braces[1]
;
+ braces[1];
} else {
output = braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
}
@ -255,10 +255,10 @@ function isArray (ar) {
function isRegExp(re) {
var s = ""+re;
var s = ''+ re;
return re instanceof RegExp // easy case
|| typeof(re) === "function" // duck-type for context-switching evalcx case
&& re.constructor.name === "RegExp"
|| typeof(re) === 'function' // duck-type for context-switching evalcx case
&& re.constructor.name === 'RegExp'
&& re.compile
&& re.test
&& re.exec
@ -268,7 +268,7 @@ function isRegExp (re) {
function isDate(d) {
if (d instanceof Date) return true;
if (typeof d !== "object") return false;
if (typeof d !== 'object') return false;
var properties = Date.prototype && Object.getOwnPropertyNames(Date.prototype);
var proto = d.__proto__ && Object.getOwnPropertyNames(d.__proto__);
return JSON.stringify(proto) === JSON.stringify(properties);
@ -279,7 +279,7 @@ var pWarning;
exports.p = function() {
if (!pWarning) {
pWarning = "util.p will be removed in future versions of Node. Use util.puts(util.inspect()) instead.\n";
pWarning = 'util.p will be removed in future versions of Node. Use util.puts(util.inspect()) instead.\n';
exports.error(pWarning);
}
for (var i = 0, len = arguments.length; i < len; ++i) {
@ -330,39 +330,39 @@ exports.pump = function (readStream, writeStream, callback) {
}
}
if (!readStream.pause) readStream.pause = function () {readStream.emit("pause");};
if (!readStream.resume) readStream.resume = function () {readStream.emit("resume");};
if (!readStream.pause) readStream.pause = function() {readStream.emit('pause');};
if (!readStream.resume) readStream.resume = function() {readStream.emit('resume');};
readStream.addListener("data", function (chunk) {
readStream.addListener('data', function(chunk) {
if (writeStream.write(chunk) === false) readStream.pause();
});
writeStream.addListener("pause", function () {
writeStream.addListener('pause', function() {
readStream.pause();
});
writeStream.addListener("drain", function () {
writeStream.addListener('drain', function() {
readStream.resume();
});
writeStream.addListener("resume", function () {
writeStream.addListener('resume', function() {
readStream.resume();
});
readStream.addListener("end", function () {
readStream.addListener('end', function() {
writeStream.end();
});
readStream.addListener("close", function () {
readStream.addListener('close', function() {
call();
});
readStream.addListener("error", function (err) {
readStream.addListener('error', function(err) {
writeStream.end();
call(err);
});
writeStream.addListener("error", function (err) {
writeStream.addListener('error', function(err) {
readStream.destroy();
call(err);
});
@ -378,8 +378,8 @@ exports.pump = function (readStream, writeStream, callback) {
* expected during bootstrapping (see mirror.js in r114903).
*
* @param {function} ctor Constructor function which needs to inherit the
* prototype
* @param {function} superCtor Constructor function to inherit prototype from
* prototype.
* @param {function} superCtor Constructor function to inherit prototype from.
*/
exports.inherits = function(ctor, superCtor) {
ctor.super_ = superCtor;

Loading…
Cancel
Save