Browse Source

debugger: fix --debug-brk

v0.9.3-release
tasogarepg 12 years ago
committed by Fedor Indutny
parent
commit
21c4b9a9eb
  1. 4
      lib/module.js
  2. 4
      test/fixtures/debug-target.js
  3. 87
      test/simple/test-debug-brk-file.js

4
lib/module.js

@ -439,9 +439,9 @@ Module.prototype._compile = function(content, filename) {
if (!resolvedArgv) { if (!resolvedArgv) {
// we enter the repl if we're not given a filename argument. // we enter the repl if we're not given a filename argument.
if (process.argv[1]) { if (process.argv[1]) {
resolvedArg = Module._resolveFilename(process.argv[1], null); resolvedArgv = Module._resolveFilename(process.argv[1], null);
} else { } else {
resolvedArg = 'repl'; resolvedArgv = 'repl';
} }
} }

4
test/fixtures/debug-target.js

@ -0,0 +1,4 @@
var a = 0;
a += 1;
a += 2;
a += 3;

87
test/simple/test-debug-brk-file.js

@ -0,0 +1,87 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
var common = require('../common');
var assert = require('assert');
var spawn = require('child_process').spawn;
var path = require('path');
var net = require('net');
var isDone = false;
var targetPath = path.resolve(common.fixturesDir, 'debug-target.js');
var child = spawn(process.execPath, ['--debug-brk=' + common.PORT, targetPath]);
child.stderr.on('data', function() {
child.emit('debug_start');
});
child.on('exit', function() {
assert(isDone);
console.log('ok');
});
child.once('debug_start', function() {
var msg = null;
var tmpBuf = '';
var conn = net.connect({port: common.PORT});
conn.setEncoding('utf8');
conn.on('data', function(data) {
tmpBuf += data;
parse();
});
function parse() {
if (!msg) {
msg = {
headers: null,
contentLength: 0
};
}
if (!msg.headers) {
var offset = tmpBuf.indexOf('\r\n\r\n');
if (offset < 0) return;
msg.headers = tmpBuf.substring(0, offset);
tmpBuf = tmpBuf.slice(offset + 4);
var matches = /Content-Length: (\d+)/.exec(msg.headers);
if (matches[1]) {
msg.contentLength = +(matches[1]);
}
}
if (msg.headers && Buffer.byteLength(tmpBuf) >= msg.contentLength) {
try {
var b = Buffer(tmpBuf);
var body = b.toString('utf8', 0, msg.contentLength);
tmpBuf = b.toString('utf8', msg.contentLength, b.length);
if (!body.length) return;
var obj = JSON.parse(body);
if (obj.type == 'event' && obj.event == 'break' && obj.body.script.name == targetPath) {
isDone = true;
var req = JSON.stringify({"seq":100, "type":"request", "command":"disconnect"});
conn.write('Content-Length: ' + req.length + '\r\n\r\n' + req);
}
} finally {
msg = null;
parse();
}
}
}
});
Loading…
Cancel
Save