Permalink
Browse files

updated dependencies

  • Loading branch information...
1 parent 791815a commit 59fc4546e66484f2a3a8fd36f49310abb2260f56 @dannycoates dannycoates committed Jul 14, 2011
Showing with 14 additions and 1,302 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 lib/debug-server.js
  3. +11 −3 package.json
  4. +0 −301 vendor/paperboy.js
  5. +0 −136 vendor/ws.js
  6. +0 −494 vendor/ws/connection.js
  7. +0 −131 vendor/ws/manager.js
  8. +0 −72 vendor/ws/mem-store.js
  9. +0 −163 vendor/ws/parser.js
View
@@ -1,2 +1,3 @@
._*
+node_modules
v8.log
View
@@ -1,8 +1,8 @@
var Http = require('http'),
EventEmitter = require('events').EventEmitter,
path = require('path'),
- WebSocket = require('../vendor/ws'),
- paperboy = require('../vendor/paperboy'),
+ WebSocket = require('websocket-server'),
+ paperboy = require('paperboy'),
debugr = require('./debugger'),
Session = require('./session');
View
@@ -1,10 +1,18 @@
{
"name": "node-inspector",
- "version": "0.1.6",
+ "version": "0.1.7",
"description": "Web Inspector based nodeJS debugger",
"homepage": "http://github.com/dannycoates/node-inspector",
"author": "Danny Coates <dannycoates@gmail.com>",
- "keywords": ["debugger", "inspector"],
+ "keywords": ["debug", "debugger", "inspector", "profiler"],
+ "repository": {
+ "type": "git",
+ "url": "http://github.com/dannycoates/node-inspector.git"
+ },
"engines" : { "node": ">=0.3.0" },
- "bin" : { "node-inspector" : "./bin/inspector.js" }
+ "bin" : { "node-inspector" : "./bin/inspector.js" },
+ "dependencies": {
+ "websocket-server": "~1.4",
+ "paperboy": "~0.0.2"
+ }
}
View
@@ -1,301 +0,0 @@
-var
- sys = require('sys'),
- events = require('events'),
- fs = require('fs'),
- url = require('url'),
- path = require('path');
-
-exports.filepath = function (webroot, url) {
- // Unescape URL to prevent security holes
- url = decodeURIComponent(url);
- // Append index.html if path ends with '/'
- fp = path.normalize(path.join(webroot, (url.match(/\/$/)=='/') ? url+'index.html' : url));
- //Sanitize input, make sure people can't use .. to get above webroot
- if (fp.substr(0,webroot.length + 1) != webroot + '/')
- return(['Permission Denied', null]);
- else
- return([null, fp]);
-};
-
-exports.streamFile = function (filepath, headerFields, stat, res, req, emitter) {
- var
- emitter = new events.EventEmitter(),
- extension = filepath.split('.').slice(-1),
- contentType = exports.contentTypes[extension] || 'application/octet-stream',
- charset = exports.charsets[contentType];
-
- process.nextTick( function() {
- if (charset)
- contentType += '; charset=' + charset;
- headerFields['Content-Type'] = contentType;
-
- var etag = '"' + stat.ino + '-' + stat.size + '-' + Date.parse(stat.mtime) +'"';
- headerFields['ETag'] = etag;
-
- var statCode;
- //Check to see if we can send a 304 and skip the send
- if(req.headers['if-none-match'] == etag){
- statCode = 304;
- headerFields['Content-Length'] = 0;
- }else {
- headerFields['Content-Length'] = stat.size;
- statCode = 200;
- if (headerFields['Expires'] != undefined) {
- var expires = new Date;
- expires.setTime(expires.getTime() + headerFields['Expires']);
- headerFields['Expires'] = expires.toUTCString();
- }
- }
-
- res.writeHead(statCode, headerFields);
-
- //If we sent a 304, skip sending a body
- if (statCode == 304 || req.method === 'HEAD') {
- res.end();
- emitter.emit("success", statCode);
- }
- else {
- fs.createReadStream(filepath,{'flags': 'r', 'encoding':
- 'binary', 'mode': 0666, 'bufferSize': 4 * 1024})
- .addListener("data", function(chunk){
- res.write(chunk, 'binary');
- })
- .addListener("end", function(){
- emitter.emit("success", statCode);
- })
- .addListener("close",function() {
- res.end();
- })
- .addListener("error", function (e) {
- emitter.emit("error", 500, e);
- });
- }
- });
- return emitter;
-};
-
-exports.deliver = function (webroot, req, res) {
- var
- stream,
- fpRes = exports.filepath(webroot, url.parse(req.url).pathname),
- fpErr = fpRes[0],
- filepath = fpRes[1],
- beforeCallback,
- afterCallback,
- otherwiseCallback,
- errorCallback,
- headerFields = {},
- addHeaderCallback,
- delegate = {
- error: function (callback) {
- errorCallback = callback;
- return delegate;
- },
- before: function (callback) {
- beforeCallback = callback;
- return delegate;
- },
- after: function (callback) {
- afterCallback = callback;
- return delegate;
- },
- otherwise: function (callback) {
- otherwiseCallback = callback;
- return delegate;
- },
- addHeader: function (name, value) {
- headerFields[name] = value;
- return delegate;
- }
- };
-
- process.nextTick(function() {
- // Create default error and otherwise callbacks if none were given.
- errorCallback = errorCallback || function(statCode) {
- res.writeHead(statCode, {'Content-Type': 'text/html'});
- res.end("<h1>HTTP " + statCode + "</h1>");
- };
- otherwiseCallback = otherwiseCallback || function() {
- res.writeHead(404, {'Content-Type': 'text/html'});
- res.end("<h1>HTTP 404 File not found</h1>");
- };
-
- //If file is in a directory outside of the webroot, deny the request
- if (fpErr) {
- statCode = 403;
- if (beforeCallback)
- beforeCallback();
- errorCallback(403, 'Forbidden');
- }
- else {
- fs.stat(filepath, function (err, stat) {
- if( (err || !stat.isFile())) {
- var exactErr = err || 'File not found';
- if (beforeCallback)
- beforeCallback();
- if (otherwiseCallback)
- otherwiseCallback(exactErr);
- } else {
- //The before callback can abort the transfer by returning false
- var cancel = beforeCallback && (beforeCallback() === false);
- if (cancel && otherwiseCallback) {
- otherwiseCallback();
- }
- else {
- stream = exports.streamFile(filepath, headerFields, stat, res, req)
-
- if(afterCallback){
- stream.addListener("success", afterCallback);
- }
- if(errorCallback){
- stream.addListener("error", errorCallback);
- }
- }
- }
- });
- }
- });
-
- return delegate;
-};
-
-exports.contentTypes = {
- "aiff": "audio/x-aiff",
- "arj": "application/x-arj-compressed",
- "asf": "video/x-ms-asf",
- "asx": "video/x-ms-asx",
- "au": "audio/ulaw",
- "avi": "video/x-msvideo",
- "bcpio": "application/x-bcpio",
- "ccad": "application/clariscad",
- "cod": "application/vnd.rim.cod",
- "com": "application/x-msdos-program",
- "cpio": "application/x-cpio",
- "cpt": "application/mac-compactpro",
- "csh": "application/x-csh",
- "css": "text/css",
- "deb": "application/x-debian-package",
- "dl": "video/dl",
- "doc": "application/msword",
- "drw": "application/drafting",
- "dvi": "application/x-dvi",
- "dwg": "application/acad",
- "dxf": "application/dxf",
- "dxr": "application/x-director",
- "etx": "text/x-setext",
- "ez": "application/andrew-inset",
- "fli": "video/x-fli",
- "flv": "video/x-flv",
- "gif": "image/gif",
- "gl": "video/gl",
- "gtar": "application/x-gtar",
- "gz": "application/x-gzip",
- "hdf": "application/x-hdf",
- "hqx": "application/mac-binhex40",
- "html": "text/html",
- "ice": "x-conference/x-cooltalk",
- "ief": "image/ief",
- "igs": "model/iges",
- "ips": "application/x-ipscript",
- "ipx": "application/x-ipix",
- "jad": "text/vnd.sun.j2me.app-descriptor",
- "jar": "application/java-archive",
- "jpeg": "image/jpeg",
- "jpg": "image/jpeg",
- "js": "text/javascript",
- "json": "application/json",
- "latex": "application/x-latex",
- "lsp": "application/x-lisp",
- "lzh": "application/octet-stream",
- "m": "text/plain",
- "m3u": "audio/x-mpegurl",
- "man": "application/x-troff-man",
- "me": "application/x-troff-me",
- "midi": "audio/midi",
- "mif": "application/x-mif",
- "mime": "www/mime",
- "movie": "video/x-sgi-movie",
- "mp4": "video/mp4",
- "mpg": "video/mpeg",
- "mpga": "audio/mpeg",
- "ms": "application/x-troff-ms",
- "nc": "application/x-netcdf",
- "oda": "application/oda",
- "ogm": "application/ogg",
- "pbm": "image/x-portable-bitmap",
- "pdf": "application/pdf",
- "pgm": "image/x-portable-graymap",
- "pgn": "application/x-chess-pgn",
- "pgp": "application/pgp",
- "pm": "application/x-perl",
- "png": "image/png",
- "pnm": "image/x-portable-anymap",
- "ppm": "image/x-portable-pixmap",
- "ppz": "application/vnd.ms-powerpoint",
- "pre": "application/x-freelance",
- "prt": "application/pro_eng",
- "ps": "application/postscript",
- "qt": "video/quicktime",
- "ra": "audio/x-realaudio",
- "rar": "application/x-rar-compressed",
- "ras": "image/x-cmu-raster",
- "rgb": "image/x-rgb",
- "rm": "audio/x-pn-realaudio",
- "rpm": "audio/x-pn-realaudio-plugin",
- "rtf": "text/rtf",
- "rtx": "text/richtext",
- "scm": "application/x-lotusscreencam",
- "set": "application/set",
- "sgml": "text/sgml",
- "sh": "application/x-sh",
- "shar": "application/x-shar",
- "silo": "model/mesh",
- "sit": "application/x-stuffit",
- "skt": "application/x-koan",
- "smil": "application/smil",
- "snd": "audio/basic",
- "sol": "application/solids",
- "spl": "application/x-futuresplash",
- "src": "application/x-wais-source",
- "stl": "application/SLA",
- "stp": "application/STEP",
- "sv4cpio": "application/x-sv4cpio",
- "sv4crc": "application/x-sv4crc",
- "swf": "application/x-shockwave-flash",
- "tar": "application/x-tar",
- "tcl": "application/x-tcl",
- "tex": "application/x-tex",
- "texinfo": "application/x-texinfo",
- "tgz": "application/x-tar-gz",
- "tiff": "image/tiff",
- "tr": "application/x-troff",
- "tsi": "audio/TSP-audio",
- "tsp": "application/dsptype",
- "tsv": "text/tab-separated-values",
- "txt": "text/plain",
- "unv": "application/i-deas",
- "ustar": "application/x-ustar",
- "vcd": "application/x-cdlink",
- "vda": "application/vda",
- "vivo": "video/vnd.vivo",
- "vrm": "x-world/x-vrml",
- "wav": "audio/x-wav",
- "wax": "audio/x-ms-wax",
- "wma": "audio/x-ms-wma",
- "wmv": "video/x-ms-wmv",
- "wmx": "video/x-ms-wmx",
- "wrl": "model/vrml",
- "wvx": "video/x-ms-wvx",
- "xbm": "image/x-xbitmap",
- "xlw": "application/vnd.ms-excel",
- "xml": "text/xml",
- "xpm": "image/x-xpixmap",
- "xwd": "image/x-xwindowdump",
- "xyz": "chemical/x-pdb",
- "zip": "application/zip"
-};
-
-exports.charsets = {
- 'text/javascript': 'UTF-8',
- 'text/html': 'UTF-8'
-};
Oops, something went wrong.

0 comments on commit 59fc454

Please sign in to comment.