azure-pipelines-task-lib 4.10.0 → 4.11.0

package/internal.js

@@ -20,7 +20,7 @@ var crypto = require("crypto");
  *  3) to know the real variable name and not just the formatted env var name.
  */
 exports._knownVariableMap = {};
-var _taskSdkToken;
+var _commandCorrelationId;
 //-----------------------------------------------------
 // Enums
 //-----------------------------------------------------
@@ -270,12 +270,12 @@ function _command(command, properties, message) {
 exports._command = _command;
 function _warning(message, source) {
     if (source === void 0) { source = IssueSource.TaskInternal; }
-    _command('task.issue', { 'type': 'warning', 'source': source, 'token': _taskSdkToken }, message);
+    _command('task.issue', { 'type': 'warning', 'source': source, 'correlationId': _commandCorrelationId }, message);
 }
 exports._warning = _warning;
 function _error(message, source) {
     if (source === void 0) { source = IssueSource.TaskInternal; }
-    _command('task.issue', { 'type': 'error', 'source': source, 'token': _taskSdkToken }, message);
+    _command('task.issue', { 'type': 'error', 'source': source, 'correlationId': _commandCorrelationId }, message);
 }
 exports._error = _error;
 function _debug(message) {
@@ -664,9 +664,9 @@ function _loadData() {
         }
     }
     _debug('loaded ' + loaded);
-    var token = process.env["TASK_SDK_COMMAND_TOKEN"];
-    delete process.env["TASK_SDK_COMMAND_TOKEN"];
-    _taskSdkToken = token ? String(token) : "";
+    var correlationId = process.env["COMMAND_CORRELATION_ID"];
+    delete process.env["COMMAND_CORRELATION_ID"];
+    _commandCorrelationId = correlationId ? String(correlationId) : "";
     // store public variable metadata
     var names;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-pipelines-task-lib",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "description": "Azure Pipelines Task SDK",
   "main": "./task.js",
   "typings": "./task.d.ts",

package/toolrunner.js

@@ -964,7 +964,42 @@ var ToolRunner = /** @class */ (function (_super) {
         state.on('debug', function (message) {
             _this._debug(message);
         });
-        var cp = child.spawn(this._getSpawnFileName(options), this._getSpawnArgs(optionsNonNull), this._getSpawnOptions(options));
+        var stdbuffer = '';
+        var errbuffer = '';
+        var emitDoneEvent = function (resolve, reject) {
+            var _this = this;
+            state.on('done', function (error, exitCode) {
+                if (stdbuffer.length > 0) {
+                    _this.emit('stdline', stdbuffer);
+                }
+                if (errbuffer.length > 0) {
+                    _this.emit('errline', errbuffer);
+                }
+                if (cp) {
+                    cp.removeAllListeners();
+                }
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    resolve(exitCode);
+                }
+            });
+        };
+        // Edge case when the node itself cant's spawn and emit event
+        var cp;
+        try {
+            cp = child.spawn(this._getSpawnFileName(options), this._getSpawnArgs(optionsNonNull), this._getSpawnOptions(options));
+        }
+        catch (error) {
+            return new Promise(function (resolve, reject) {
+                emitDoneEvent(resolve, reject);
+                state.processError = error.message;
+                state.processExited = true;
+                state.processClosed = true;
+                state.CheckComplete();
+            });
+        }
         this.childProcess = cp;
         // it is possible for the child process to end its last line without a new line.
         // because stdout is buffered, this causes the last line to not get sent to the parent
@@ -974,7 +1009,6 @@ var ToolRunner = /** @class */ (function (_super) {
                 optionsNonNull.outStream.write(os.EOL);
             }
         });
-        var stdbuffer = '';
         (_b = cp.stdout) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
             _this.emit('stdout', data);
             if (!optionsNonNull.silent) {
@@ -984,7 +1018,6 @@ var ToolRunner = /** @class */ (function (_super) {
                 _this.emit('stdline', line);
             });
         });
-        var errbuffer = '';
         (_c = cp.stderr) === null || _c === void 0 ? void 0 : _c.on('data', function (data) {
             state.processStderr = true;
             _this.emit('stderr', data);
@@ -1015,23 +1048,7 @@ var ToolRunner = /** @class */ (function (_super) {
             _this._debug("STDIO streams have closed for tool '" + _this.toolPath + "'");
             state.CheckComplete();
         });
-        return new Promise(function (resolve, reject) {
-            state.on('done', function (error, exitCode) {
-                if (stdbuffer.length > 0) {
-                    _this.emit('stdline', stdbuffer);
-                }
-                if (errbuffer.length > 0) {
-                    _this.emit('errline', errbuffer);
-                }
-                cp.removeAllListeners();
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    resolve(exitCode);
-                }
-            });
-        });
+        return new Promise(emitDoneEvent);
     };
     /**
      * Exec a tool.
@@ -1063,7 +1080,37 @@ var ToolRunner = /** @class */ (function (_super) {
         state.on('debug', function (message) {
             _this._debug(message);
         });
-        var cp = child.spawn(this._getSpawnFileName(options), this._getSpawnArgs(optionsNonNull), this._getSpawnOptions(options));
+        var stdbuffer = '';
+        var errbuffer = '';
+        state.on('done', function (error, exitCode) {
+            if (stdbuffer.length > 0) {
+                _this.emit('stdline', stdbuffer);
+            }
+            if (errbuffer.length > 0) {
+                _this.emit('errline', errbuffer);
+            }
+            if (cp) {
+                cp.removeAllListeners();
+            }
+            if (error) {
+                defer.reject(error);
+            }
+            else {
+                defer.resolve(exitCode);
+            }
+        });
+        // Edge case when the node itself cant's spawn and emit event
+        var cp;
+        try {
+            cp = child.spawn(this._getSpawnFileName(options), this._getSpawnArgs(optionsNonNull), this._getSpawnOptions(options));
+        }
+        catch (error) {
+            state.processError = error.message;
+            state.processExited = true;
+            state.processClosed = true;
+            state.CheckComplete();
+            return defer.promise;
+        }
         this.childProcess = cp;
         // it is possible for the child process to end its last line without a new line.
         // because stdout is buffered, this causes the last line to not get sent to the parent
@@ -1073,7 +1120,6 @@ var ToolRunner = /** @class */ (function (_super) {
                 optionsNonNull.outStream.write(os.EOL);
             }
         });
-        var stdbuffer = '';
         (_b = cp.stdout) === null || _b === void 0 ? void 0 : _b.on('data', function (data) {
             _this.emit('stdout', data);
             if (!optionsNonNull.silent) {
@@ -1083,7 +1129,6 @@ var ToolRunner = /** @class */ (function (_super) {
                 _this.emit('stdline', line);
             });
         });
-        var errbuffer = '';
         (_c = cp.stderr) === null || _c === void 0 ? void 0 : _c.on('data', function (data) {
             state.processStderr = true;
             _this.emit('stderr', data);
@@ -1114,21 +1159,6 @@ var ToolRunner = /** @class */ (function (_super) {
             _this._debug("STDIO streams have closed for tool '" + _this.toolPath + "'");
             state.CheckComplete();
         });
-        state.on('done', function (error, exitCode) {
-            if (stdbuffer.length > 0) {
-                _this.emit('stdline', stdbuffer);
-            }
-            if (errbuffer.length > 0) {
-                _this.emit('errline', errbuffer);
-            }
-            cp.removeAllListeners();
-            if (error) {
-                defer.reject(error);
-            }
-            else {
-                defer.resolve(exitCode);
-            }
-        });
         return defer.promise;
     };
     /**