Merge pull request #43 from bugsnag/bengourley/upload-sources-fix

Fix --upload-sources stream/buffer logic

cli.js

@@ -100,6 +100,8 @@ for (const key in conf) {
 }
 
 upload(conf, logger).catch(err => {
-  logger.error(`Error uploading source maps: ${err.message}`)
+  const stack = (err && err.stack) ? err.stack : err
+  const apiResponse = (err && err.errors) ? `\n\n  API response:\n    ${err.errors.join(', ')}\n` : ''
+  logger.error(`Error uploading source maps: ${stack}${apiResponse}`)
   process.exitCode = 1
 })

index.js

@@ -93,7 +93,7 @@ function uploadMany (options, logger) {
         const minifiedUrl = path.relative(options.projectRoot, f.replace(/\.map$/, ''))
         const minifiedFile = f.replace(/\.map$/, '')
         return cb => {
-          const opts = Object.assign({}, options, { sourceMap: f, minifiedUrl: minifiedUrl, minifiedFile: minifiedFile })
+          const opts = Object.assign({}, options, { sourceMap: f, minifiedUrl: minifiedUrl, minifiedFile: minifiedFile, sources: {} })
           uploadOne(opts, logger)
             .then(() => {
               logger.info(`Upload successful (${path.basename(f)})`)

lib/options.js

@@ -103,22 +103,20 @@ function transformSourcesMap (options) {
     readFileJSON(options.sourceMap)
       .then(sourceMap => (
         mapSources(sourceMap, p => {
-          // resolve a relative path in the sources array if it begins with a ".." e.g. "../../src/index.js"
-          const resolvedPath = /^\.\./.test(p)
-            ? path.resolve(path.dirname(options.sourceMap), p)
-            : p
+          // resolve a relative path in the sources array
+          const resolvedPath = path.resolve(path.dirname(options.sourceMap), p)
 
           // then make it relative to the project root
           const relativePath = stripProjectRoot(options.projectRoot, resolvedPath)
 
-          return doesFileExist(p).then(exists => {
+          return doesFileExist(resolvedPath).then(exists => {
             if (exists && options.uploadSources) {
-              if (p.indexOf('node_modules') !== -1) {
+              if (resolvedPath.indexOf('node_modules') !== -1) {
                 if (options.uploadNodeModules) {
-                  options.sources[relativePath] = p
+                  options.sources[relativePath] = resolvedPath
                 }
               } else {
-                options.sources[relativePath] = p
+                options.sources[relativePath] = resolvedPath
               }
             }
             return relativePath

lib/prepare-request.js

@@ -73,11 +73,11 @@ module.exports = function prepareRequest (options) {
  * valid file path or whether it's a Buffer object (used for sourceMap when uploadSources
  * is set to `true`, because the sourcemap is modified).
  *
- * @param {string|Buffer} path The path of the file, or the file Buffer
+ * @param {string|Buffer} pathOrBuffer The path of the file, or the file Buffer
  * @returns {fs.ReadStream|Buffer}
  */
 function getSendableSource (pathOrBuffer) {
-  if (typeof path === 'string') {
+  if (typeof pathOrBuffer === 'string') {
     return createReadStream(pathOrBuffer)
   } else if (Buffer.isBuffer(pathOrBuffer)) {
     return pathOrBuffer

lib/request.js

@@ -51,6 +51,7 @@ const send = (endpoint, data, onSuccess, onError) => {
         return onError(err)
       } catch (_) {
         const e = new Error(`HTTP status ${res.statusCode} received from upload API`)
+        e.errors = [ body.toString() ]
         e.isRetryable = false
         return onError(e)
       }