Trim exception stack trace in faults

lib/cache.coffee

@@ -192,7 +192,7 @@ refresh = (callback) ->
         for r in res
           provisions[r._id] = {}
           provisions[r._id].md5 = crypto.createHash('md5').update(r.script).digest('hex')
-          provisions[r._id].script = new vm.Script("\"use strict\";(function(){\n#{r.script}\n})();", {filename: r._id, lineOffset: 1, timeout: 50})
+          provisions[r._id].script = new vm.Script("\"use strict\";(function(){\n#{r.script}\n})();", {filename: r._id, lineOffset: -1, timeout: 50})
 
         if (counter -= 2) == 1
           computeHash()
@@ -213,7 +213,7 @@ refresh = (callback) ->
         for r in res
           virtualParameters[r._id] = {}
           virtualParameters[r._id].md5 = crypto.createHash('md5').update(r.script).digest('hex')
-          virtualParameters[r._id].script = new vm.Script("\"use strict\";(function(){\n#{r.script}\n})();", {filename: r._id, lineOffset: 1, timeout: 50})
+          virtualParameters[r._id].script = new vm.Script("\"use strict\";(function(){\n#{r.script}\n})();", {filename: r._id, lineOffset: -1, timeout: 50})
 
         if (counter -= 2) == 1
           computeHash()

lib/sandbox.js

@@ -224,13 +224,16 @@ function errorToFault(err) {
   if (!err)
     return null;
 
+  // Trim the stack trace at the self-executing anonymous wrapper function
+  let stackTrimIndex = err.stack.match(/\s+at\s[^\s]+\s+at\s[^\s]+\s\(vm\.js.+\)/).index;
+
   return {
     code: `script.${err.name}`,
     message: err.message,
     detail: {
       name: err.name,
       message: err.message,
-      stack: err.stack
+      stack: err.stack.slice(0, stackTrimIndex)
     }
   }
 }