lib: externalized messages support

.eslintrc

@@ -13,6 +13,7 @@ ecmaFeatures:
   objectLiteralShorthandProperties: true
   octalLiterals: true
   templateStrings: true
+  restParams: true
 
 rules:
   # Possible Errors

lib/_debug_agent.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const I18N = require('internal/messages');
 const assert = require('assert');
 const net = require('net');
 const util = require('util');
@@ -20,7 +21,7 @@ exports.start = function start() {
 
   agent.listen(process._debugAPI.port, function() {
     var addr = this.address();
-    process._rawDebug('Debugger listening on port %d', addr.port);
+    process._rawDebug(I18N(I18N.DEBUGAGENT_LISTENING, addr.port));
     process._debugAPI.notifyListen();
   });
 
@@ -57,7 +58,7 @@ function Agent() {
   };
 
   this.clients = [];
-  assert(this.binding, 'Debugger agent running without bindings!');
+  assert(this.binding, I18N(I18N.DEBUGAGENT_NO_BINDINGS));
 }
 util.inherits(Agent, net.Server);
 
@@ -132,15 +133,15 @@ Client.prototype._transform = function _transform(data, enc, cb) {
       //   Header-name: header-value\r\n
       var match = this.buffer.match(/^([^:\s\r\n]+)\s*:\s*([^\s\r\n]+)\r\n/);
       if (!match)
-        return this.destroy('Expected header, but failed to parse it');
+        return this.destroy(I18N(I18N.DEBUGAGENT_EXPECTED_HEADER));
 
       this.headers[match[1].toLowerCase()] = match[2];
 
       this.buffer = this.buffer.slice(match[0].length);
     } else {
       var len = this.headers['content-length'];
       if (len === undefined)
-        return this.destroy('Expected content-length');
+        return this.destroy(I18N(I18N.DEBUGAGENT_EXPECTED_CONTENT_LENGTH));
 
       len = len | 0;
       if (Buffer.byteLength(this.buffer) < len)

lib/_debugger.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const I18N = require('internal/messages');
 const internalUtil = require('internal/util');
 const util = require('util');
 const path = require('path');
@@ -12,13 +13,16 @@ const assert = require('assert');
 const spawn = require('child_process').spawn;
 const Buffer = require('buffer').Buffer;
 
+const USAGE = `${I18N(I18N.DEBUGGER_USAGE)}:
+       node debug script.js
+       node debug <host>:<port>
+       node debug -p <pid>`;
+
 exports.start = function(argv, stdin, stdout) {
   argv || (argv = process.argv.slice(2));
 
   if (argv.length < 1) {
-    console.error('Usage: node debug script.js');
-    console.error('       node debug <host>:<port>');
-    console.error('       node debug -p <pid>');
+    console.error(USAGE);
     process.exit(1);
   }
 
@@ -32,8 +36,8 @@ exports.start = function(argv, stdin, stdout) {
   stdin.resume();
 
   process.on('uncaughtException', function(e) {
-    internalUtil.error('There was an internal error in Node\'s debugger. ' +
-                       'Please report this bug.');
+    // Report internal error
+    internalUtil.error(I18N(I18N.DEBUGGER_ERROR));
     console.error(e.message);
     console.error(e.stack);
     if (interface_.child) interface_.child.kill();
@@ -126,7 +130,7 @@ Protocol.prototype.execute = function(d) {
       break;
 
     default:
-      throw new Error('Unknown state');
+      throw new I18N.Error(I18N.DEBUGGER_UNKNOWN_STATE);
   }
 };
 
@@ -135,8 +139,7 @@ Protocol.prototype.serialize = function(req) {
   req.type = 'request';
   req.seq = this.reqSeq++;
   var json = JSON.stringify(req);
-  return 'Content-Length: ' + Buffer.byteLength(json, 'utf8') +
-         '\r\n\r\n' + json;
+  return `Content-Length: ${Buffer.byteLength(json, 'utf8')}\r\n\r\n${json}`;
 };
 
 
@@ -521,7 +524,7 @@ Client.prototype.mirrorObject = function(handle, depth, cb) {
     cb = cb || function() {};
     this.reqLookup(propertyRefs, function(err, res) {
       if (err) {
-        internalUtil.error('problem with reqLookup');
+        internalUtil.error(I18N(I18N.DEBUGGER_PROBLEM_REQLOOKUP));
         cb(null, handle);
         return;
       }
@@ -598,7 +601,8 @@ Client.prototype.fullTrace = function(cb) {
   cb = cb || function() {};
   this.reqBacktrace(function(err, trace) {
     if (err) return cb(err);
-    if (trace.totalFrames <= 0) return cb(Error('No frames'));
+    if (trace.totalFrames <= 0)
+      return cb(new I18N.Error(I18N.DEBUGGER_NO_FRAMES));
 
     var refs = [];
 
@@ -669,11 +673,8 @@ const commands = [
   ]
 ];
 
-
-var helpMessage = 'Commands: ' + commands.map(function(group) {
-  return group.join(', ');
-}).join(',\n');
-
+var cmdList = commands.map((group) => group.join(', ')).join(',\n');
+var helpMessage = `${I18N(I18N.DEBUGGER_COMMANDS)}: ${cmdList}`;
 
 function SourceUnderline(sourceText, position, repl) {
   if (!sourceText) return '';
@@ -695,7 +696,9 @@ function SourceUnderline(sourceText, position, repl) {
 
 
 function SourceInfo(body) {
-  var result = body.exception ? 'exception in ' : 'break in ';
+  var result = body.exception ?
+    I18N(I18N.DEBUGGER_EXCEPTION_IN) :
+    I18N(I18N.DEBUGGER_BREAK_IN);
 
   if (body.script) {
     if (body.script.name) {
@@ -932,7 +935,7 @@ Interface.prototype.handleBreak = function(r) {
 // Internal method for checking connection state
 Interface.prototype.requireConnection = function() {
   if (!this.client) {
-    this.error('App isn\'t running... Try `run` instead');
+    this.error(I18N(I18N.DEBUGGER_APP_NOT_RUNNING));
     return false;
   }
   return true;
@@ -1038,7 +1041,7 @@ Interface.prototype.run = function() {
   var callback = arguments[0];
 
   if (this.child) {
-    this.error('App is already running... Try `restart` instead');
+    this.error(I18N(I18N.DEBUGGER_APP_RUNNING));
     callback && callback(true);
   } else {
     this.trySpawn(callback);
@@ -1094,7 +1097,7 @@ Interface.prototype.list = function(delta) {
   self.pause();
   client.reqSource(from, to, function(err, res) {
     if (err || !res) {
-      self.error('You can\'t list source code right now');
+      self.error(I18N(I18N.DEBUGGER_CANNOT_LIST_SOURCE));
       self.resume();
       return;
     }
@@ -1153,13 +1156,13 @@ Interface.prototype.backtrace = function() {
   self.pause();
   client.fullTrace(function(err, bt) {
     if (err) {
-      self.error('Can\'t request backtrace now');
+      self.error(I18N(I18N.DEBUGGER_CANNOT_REQUEST_BACKTRACE));
       self.resume();
       return;
     }
 
     if (bt.totalFrames == 0) {
-      self.print('(empty stack)');
+      self.print(I18N(I18N.DEBUGGER_EMPTY_STACK));
     } else {
       var trace = [],
           firstFrameNative = bt.frames[0].script.isNative;
@@ -1296,7 +1299,7 @@ Interface.prototype.watchers = function() {
 
   function wait() {
     if (--waiting === 0) {
-      if (verbose) self.print('Watchers:');
+      if (verbose) self.print(`${I18N(I18N.DEBUGGER_WATCHERS)}: `);
 
       self._watchers.forEach(function(watcher, i) {
         self.print(leftPad(i, ' ', self._watchers.length - 1) +
@@ -1348,8 +1351,7 @@ Interface.prototype.setBreakpoint = function(script, line,
   }
 
   if (script === undefined) {
-    this.print('Cannot determine the current script, ' +
-        'make sure the debugged process is paused.');
+    this.print(I18N(I18N.DEBUGGER_CANNOT_DETERMINE_SCRIPT));
     return;
   }
 
@@ -1378,8 +1380,10 @@ Interface.prototype.setBreakpoint = function(script, line,
       scriptId = script;
     }
 
-    if (ambiguous) return this.error('Script name is ambiguous');
-    if (line <= 0) return this.error('Line should be a positive value');
+    if (ambiguous)
+      return this.error(I18N(I18N.DEBUGGER_SCRIPT_NAME_AMBIGUOUS));
+    if (line <= 0)
+      return this.error(I18N(I18N.DEBUGGER_LINE_POSITIVE));
 
     var req;
     if (scriptId) {
@@ -1390,7 +1394,7 @@ Interface.prototype.setBreakpoint = function(script, line,
         condition: condition
       };
     } else {
-      this.print('Warning: script \'' + script + '\' was not loaded yet.');
+      this.print(I18N(I18N.DEBUGGER_SCRIPT_NOT_LOADED, script));
       var escapedPath = script.replace(/([/\\.?*()^${}|[\]])/g, '\\$1');
       var scriptPathRegex = '^(.*[\\/\\\\])?' + escapedPath + '$';
       req = {
@@ -1472,15 +1476,14 @@ Interface.prototype.clearBreakpoint = function(script, line) {
     }
   }
 
-  if (ambiguous) return this.error('Script name is ambiguous');
+  if (ambiguous)
+    return this.error(I18N(I18N.DEBUGGER_SCRIPT_NAME_AMBIGUOUS));
 
-  if (scriptId === undefined) {
-    return this.error('Script ' + script + ' not found');
-  }
+  if (scriptId === undefined)
+    return this.error(I18N(I18N.DEBUGGER_SCRIPT_NOT_FOUND, script));
 
-  if (breakpoint === undefined) {
-    return this.error('Breakpoint not found on line ' + line);
-  }
+  if (breakpoint === undefined)
+    return this.error(I18N(I18N.DEBUGGER_BREAKPOINT_NOT_FOUND, line));
 
   var self = this,
       req = {
@@ -1560,7 +1563,7 @@ Interface.prototype.repl = function() {
 
   var self = this;
 
-  self.print('Press Ctrl + C to leave debug repl');
+  self.print(I18N(I18N.DEBUGGER_REPL_EXIT));
 
   // Don't display any default messages
   var listeners = this.repl.rli.listeners('SIGINT').slice(0);
@@ -1671,7 +1674,7 @@ Interface.prototype.trySpawn = function(cb) {
         process._debugProcess(pid);
       } catch (e) {
         if (e.code === 'ESRCH') {
-          internalUtil.error(`Target process: ${pid} doesn't exist.`);
+          internalUtil.error(I18N(I18N.DEBUGGER_TARGET_PROCESS, pid));
           process.exit(1);
         }
         throw e;
@@ -1702,17 +1705,18 @@ Interface.prototype.trySpawn = function(cb) {
       connectionAttempts = 0;
 
   client.once('ready', function() {
-    self.stdout.write(' ok\n');
+    self.stdout.write(` ${I18N(I18N.DEBUGGER_READY)}\n`);
 
     // Restore breakpoints
     breakpoints.forEach(function(bp) {
-      self.print('Restoring breakpoint ' + bp.scriptReq + ':' + bp.line);
+      self.print(`${I18N(I18N.DEBUGGER_RESTORING_BREAKPOINT)} ` +
+                 `${bp.scriptReq}:${bp.line}`);
       self.setBreakpoint(bp.scriptReq, bp.line, bp.condition, true);
     });
 
     client.on('close', function() {
       self.pause();
-      self.print('program terminated');
+      self.print(I18N(I18N.DEBUGGER_PROGRAM_TERMINATED));
       self.resume();
       self.client = null;
       self.killChild();
@@ -1724,7 +1728,8 @@ Interface.prototype.trySpawn = function(cb) {
 
   client.on('unhandledResponse', function(res) {
     self.pause();
-    self.print('\nunhandled res:' + JSON.stringify(res));
+    self.print(`\n${I18N(I18N.DEBUGGER_UNHANDLED_RESPONSE)}: ` +
+               `${JSON.stringify(res)}`);
     self.resume();
   });
 
@@ -1740,7 +1745,7 @@ Interface.prototype.trySpawn = function(cb) {
   function connectError() {
     // If it's failed to connect 10 times then print failed message
     if (connectionAttempts >= 10) {
-      internalUtil.error(' failed to connect, please retry');
+      internalUtil.error(I18N(I18N.DEBUGGER_CONNECTION_FAILED));
       process.exit(1);
     }
     setTimeout(attemptConnect, 500);
@@ -1753,11 +1758,13 @@ Interface.prototype.trySpawn = function(cb) {
   }
 
   if (isRemote) {
-    self.print('connecting to ' + host + ':' + port + ' ..', true);
+    self.print(`${I18N(I18N.DEBUGGER_CONNECTING)} ${host}:${port} ..`,
+               true);
     attemptConnect();
   } else {
     this.child.stderr.once('data', function() {
-      self.print('connecting to ' + host + ':' + port + ' ..', true);
+      self.print(`${I18N(I18N.DEBUGGER_CONNECTING)} ${host}:${port} ..`,
+                 true);
       setImmediate(attemptConnect);
     });
   }