slnodejs 6.1.251 → 6.1.257
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser-agent/dist/browser-agent-all.js +1 -1
- package/browser-agent/dist/browser-agent-all.min.js +1 -1
- package/browser-agent/package.json +1 -1
- package/package.json +1 -1
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js +94 -81
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/content-instrumenter.js +27 -0
- package/tsOutputs/build-scanner/instrumentation/content-instrumenter.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js +161 -0
- package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js +12 -3
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/process-pool/instrumenter-spawn.js +56 -0
- package/tsOutputs/build-scanner/instrumentation/process-pool/instrumenter-spawn.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/process-pool/process-pool.js +99 -0
- package/tsOutputs/build-scanner/instrumentation/process-pool/process-pool.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/copy-as-is-stratagy.js +25 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/copy-as-is-stratagy.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/instrumentation-stratagy.interface.js +3 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/instrumentation-stratagy.interface.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/js-instrumnetation-stratagy.js +44 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/js-instrumnetation-stratagy.js.map +1 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/markup-instrumnetation-stratagy.js +170 -0
- package/tsOutputs/build-scanner/instrumentation/stratagies/markup-instrumnetation-stratagy.js.map +1 -0
- package/tsOutputs/cli-parse/executors/base-executor.js +37 -34
- package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-executor.js +4 -10
- package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js +4 -10
- package/tsOutputs/cli-parse/executors/nyc-report-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js +10 -17
- package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js +0 -343
- package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js.map +0 -1
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js +0 -186
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js.map +0 -1
- package/tsOutputs/build-scanner/instrumentation/sync-instrumenter.js +0 -47
- package/tsOutputs/build-scanner/instrumentation/sync-instrumenter.js.map +0 -1
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __extends = (this && this.__extends) || (function () {
|
|
3
|
+
var extendStatics = function (d, b) {
|
|
4
|
+
extendStatics = Object.setPrototypeOf ||
|
|
5
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
+
return extendStatics(d, b);
|
|
8
|
+
};
|
|
9
|
+
return function (d, b) {
|
|
10
|
+
extendStatics(d, b);
|
|
11
|
+
function __() { this.constructor = d; }
|
|
12
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
13
|
+
};
|
|
14
|
+
})();
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.ProcessPool = void 0;
|
|
17
|
+
var events_1 = require("events");
|
|
18
|
+
var path = require("path");
|
|
19
|
+
var child_process_1 = require("child_process");
|
|
20
|
+
var kTaskInfo = Symbol('kTaskInfo');
|
|
21
|
+
var kProcessFreedEvent = Symbol('kProcessFreedEvent');
|
|
22
|
+
var ProcessPool = /** @class */ (function (_super) {
|
|
23
|
+
__extends(ProcessPool, _super);
|
|
24
|
+
function ProcessPool(numProcesses, processOptions) {
|
|
25
|
+
var _this = _super.call(this) || this;
|
|
26
|
+
_this.numProcesses = numProcesses;
|
|
27
|
+
_this.processes = [];
|
|
28
|
+
_this.freeProcesses = [];
|
|
29
|
+
_this.processOptions = '';
|
|
30
|
+
_this.processOptions = JSON.stringify(processOptions);
|
|
31
|
+
for (var i = 0; i < _this.numProcesses; i++) {
|
|
32
|
+
_this.addNewProcess();
|
|
33
|
+
}
|
|
34
|
+
return _this;
|
|
35
|
+
}
|
|
36
|
+
ProcessPool.prototype.addNewProcess = function () {
|
|
37
|
+
var _this = this;
|
|
38
|
+
var pathToInstrumenter = path.resolve(__dirname, 'instrumenter-spawn.js');
|
|
39
|
+
var subprocess = child_process_1.fork(pathToInstrumenter, [this.processOptions], { silent: true });
|
|
40
|
+
subprocess.on('message', function (result) {
|
|
41
|
+
var _a;
|
|
42
|
+
// In case of success: Call the callback that was passed to `runTask`,
|
|
43
|
+
// remove the `TaskInfo` associated with the Worker, and mark it as free
|
|
44
|
+
// again.
|
|
45
|
+
(_a = subprocess[kTaskInfo]) === null || _a === void 0 ? void 0 : _a.call(subprocess, null, result);
|
|
46
|
+
subprocess[kTaskInfo] = null;
|
|
47
|
+
_this.freeProcesses.push(subprocess);
|
|
48
|
+
_this.emit(kProcessFreedEvent);
|
|
49
|
+
});
|
|
50
|
+
subprocess.stderr.on('data', function (data) {
|
|
51
|
+
var _a;
|
|
52
|
+
if (data.toString().indexOf('FATAL ERROR: Reached heap limit Allocation failed') > -1) {
|
|
53
|
+
if (subprocess[kTaskInfo]) {
|
|
54
|
+
(_a = subprocess[kTaskInfo]) === null || _a === void 0 ? void 0 : _a.call(subprocess, new Error('out of memory'), null);
|
|
55
|
+
subprocess[kTaskInfo] = null;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
_this.emit('error', new Error('out of memory'));
|
|
59
|
+
}
|
|
60
|
+
// Remove the worker from the list and start a new Worker to replace the
|
|
61
|
+
// current one.
|
|
62
|
+
_this.processes.splice(_this.processes.indexOf(subprocess), 1);
|
|
63
|
+
_this.addNewProcess();
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
this.processes.push(subprocess);
|
|
67
|
+
this.freeProcesses.push(subprocess);
|
|
68
|
+
this.emit(kProcessFreedEvent);
|
|
69
|
+
};
|
|
70
|
+
ProcessPool.prototype.runTask = function (task) {
|
|
71
|
+
var _this = this;
|
|
72
|
+
return new Promise(function (resolve, reject) {
|
|
73
|
+
if (_this.freeProcesses.length === 0) {
|
|
74
|
+
// No free threads, wait until a worker thread becomes free.
|
|
75
|
+
_this.once(kProcessFreedEvent, function () {
|
|
76
|
+
resolve(_this.runTask(task));
|
|
77
|
+
});
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
var subprocess = _this.freeProcesses.pop();
|
|
81
|
+
subprocess[kTaskInfo] = function (error, result) {
|
|
82
|
+
if (error) {
|
|
83
|
+
return reject(error);
|
|
84
|
+
}
|
|
85
|
+
return resolve(result);
|
|
86
|
+
};
|
|
87
|
+
subprocess.send(task);
|
|
88
|
+
});
|
|
89
|
+
};
|
|
90
|
+
ProcessPool.prototype.close = function () {
|
|
91
|
+
for (var _i = 0, _a = this.processes; _i < _a.length; _i++) {
|
|
92
|
+
var subprocess = _a[_i];
|
|
93
|
+
subprocess.kill();
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
return ProcessPool;
|
|
97
|
+
}(events_1.EventEmitter));
|
|
98
|
+
exports.ProcessPool = ProcessPool;
|
|
99
|
+
//# sourceMappingURL=process-pool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-pool.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/process-pool/process-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CopyAsIsStrategy = void 0;
|
|
4
|
+
var fileAndFolderUtils = require("../../../build-scanner/file-and-folder-utils");
|
|
5
|
+
var CopyAsIsStrategy = /** @class */ (function () {
|
|
6
|
+
function CopyAsIsStrategy(logger) {
|
|
7
|
+
this.logger = logger;
|
|
8
|
+
}
|
|
9
|
+
CopyAsIsStrategy.prototype.instrumentFile = function (inputFile, outputFile, fileKey) {
|
|
10
|
+
var _this = this;
|
|
11
|
+
return new Promise(function (resolve, reject) {
|
|
12
|
+
fileAndFolderUtils.copyFileAsIs(inputFile, outputFile, fileKey, _this.logger, function (err) {
|
|
13
|
+
if (err) {
|
|
14
|
+
reject(err);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
resolve();
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
return CopyAsIsStrategy;
|
|
23
|
+
}());
|
|
24
|
+
exports.CopyAsIsStrategy = CopyAsIsStrategy;
|
|
25
|
+
//# sourceMappingURL=copy-as-is-stratagy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"copy-as-is-stratagy.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/stratagies/copy-as-is-stratagy.ts"],"names":[],"mappings":";;;AAAA,iFAAmF;AAInF;IAEI,0BAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAElC,CAAC;IAED,yCAAc,GAAd,UAAe,SAAiB,EAAE,UAAkB,EAAE,OAAe;QAArE,iBAUC;QATG,OAAO,IAAI,OAAO,CAAO,UAAC,OAAO,EAAE,MAAM;YACrC,kBAAkB,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,KAAI,CAAC,MAAM,EAAE,UAAC,GAAG;gBAC7E,IAAI,GAAG,EAAE;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;qBAAM;oBACH,OAAO,EAAE,CAAC;iBACb;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAA;IACN,CAAC;IACL,uBAAC;AAAD,CAAC,AAjBD,IAiBC;AAjBY,4CAAgB"}
|
package/tsOutputs/build-scanner/instrumentation/stratagies/instrumentation-stratagy.interface.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instrumentation-stratagy.interface.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/stratagies/instrumentation-stratagy.interface.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.JsFileInstrumentationStratagy = void 0;
|
|
4
|
+
var instrumented_file_size_reducer_1 = require("../instrumented-file-size-reducer");
|
|
5
|
+
var fs_1 = require("fs");
|
|
6
|
+
var validation_utils_1 = require("../../../common/utils/validation-utils");
|
|
7
|
+
var JsFileInstrumentationStratagy = /** @class */ (function () {
|
|
8
|
+
function JsFileInstrumentationStratagy(config, instrumenter, preamble, logger) {
|
|
9
|
+
this.config = config;
|
|
10
|
+
this.instrumenter = instrumenter;
|
|
11
|
+
this.preamble = preamble;
|
|
12
|
+
this.logger = logger;
|
|
13
|
+
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(config, 'config');
|
|
14
|
+
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(instrumenter, 'instrumenter');
|
|
15
|
+
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(preamble, 'preamble');
|
|
16
|
+
validation_utils_1.ValidationUtils.verifyNotNullOrEmpty(logger, 'logger');
|
|
17
|
+
}
|
|
18
|
+
JsFileInstrumentationStratagy.prototype.instrumentFile = function (inputFile, outputFile, fileKey) {
|
|
19
|
+
var content = this.getContent(inputFile);
|
|
20
|
+
var instrumentedContent = this.instrumenter.instrumentContent(content, fileKey);
|
|
21
|
+
instrumentedContent = this.postInstrumentation(instrumentedContent, fileKey);
|
|
22
|
+
fs_1.writeFileSync(outputFile, instrumentedContent, 'utf8');
|
|
23
|
+
};
|
|
24
|
+
JsFileInstrumentationStratagy.prototype.getContent = function (inputFile) {
|
|
25
|
+
var contentBuffer = fs_1.readFileSync(inputFile);
|
|
26
|
+
return contentBuffer.toString();
|
|
27
|
+
};
|
|
28
|
+
JsFileInstrumentationStratagy.prototype.postInstrumentation = function (instrumentedContent, fileKey) {
|
|
29
|
+
if (this.config.shouldReduceInstrumentedFileSize) {
|
|
30
|
+
instrumentedContent = this.reduceFileSize(instrumentedContent, fileKey);
|
|
31
|
+
}
|
|
32
|
+
instrumentedContent = this.addPreamble(instrumentedContent);
|
|
33
|
+
return instrumentedContent;
|
|
34
|
+
};
|
|
35
|
+
JsFileInstrumentationStratagy.prototype.addPreamble = function (instrumentedContent) {
|
|
36
|
+
return this.preamble.concat([instrumentedContent]).join('\n');
|
|
37
|
+
};
|
|
38
|
+
JsFileInstrumentationStratagy.prototype.reduceFileSize = function (instrumentedCode, fileKey) {
|
|
39
|
+
return instrumented_file_size_reducer_1.reduceContentSize(fileKey, instrumentedCode, this.config.babylonPlugins, !this.config.useBranchCoverage, this.config.shouldMinifyInstrumentedOutput, this.logger);
|
|
40
|
+
};
|
|
41
|
+
return JsFileInstrumentationStratagy;
|
|
42
|
+
}());
|
|
43
|
+
exports.JsFileInstrumentationStratagy = JsFileInstrumentationStratagy;
|
|
44
|
+
//# sourceMappingURL=js-instrumnetation-stratagy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"js-instrumnetation-stratagy.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/stratagies/js-instrumnetation-stratagy.ts"],"names":[],"mappings":";;;AAGA,oFAAsE;AACtE,yBAAiD;AACjD,2EAAyE;AASzE;IAEI,uCACc,MAAsC,EACtC,YAAiC,EACjC,QAAkB,EAClB,MAAc;QAHd,WAAM,GAAN,MAAM,CAAgC;QACtC,iBAAY,GAAZ,YAAY,CAAqB;QACjC,aAAQ,GAAR,QAAQ,CAAU;QAClB,WAAM,GAAN,MAAM,CAAQ;QAExB,kCAAe,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvD,kCAAe,CAAC,oBAAoB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACnE,kCAAe,CAAC,oBAAoB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC3D,kCAAe,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,sDAAc,GAAd,UAAe,SAAiB,EAAE,UAAkB,EAAE,OAAe;QACjE,IAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAE3C,IAAI,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhF,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAE5E,kBAAa,CAAC,UAAU,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAES,kDAAU,GAApB,UAAqB,SAAiB;QAClC,IAAM,aAAa,GAAG,iBAAY,CAAC,SAAS,CAAC,CAAC;QAC9C,OAAO,aAAa,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IAES,2DAAmB,GAA7B,UAA8B,mBAAmB,EAAE,OAAO;QACtD,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAgC,EAAE;YAC9C,mBAAmB,GAAG,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;SAC3E;QAED,mBAAmB,GAAG,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;QAC5D,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAES,mDAAW,GAArB,UAAsB,mBAA2B;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAEO,sDAAc,GAAtB,UAAuB,gBAAwB,EAAE,OAAe;QAC5D,OAAO,kDAAiB,CACpB,OAAO,EACP,gBAAgB,EAChB,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAC9B,IAAI,CAAC,MAAM,CAAC,8BAA8B,EAC1C,IAAI,CAAC,MAAM,CACd,CAAC;IACN,CAAC;IAEL,oCAAC;AAAD,CAAC,AArDD,IAqDC;AArDY,sEAA6B"}
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __extends = (this && this.__extends) || (function () {
|
|
3
|
+
var extendStatics = function (d, b) {
|
|
4
|
+
extendStatics = Object.setPrototypeOf ||
|
|
5
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
+
return extendStatics(d, b);
|
|
8
|
+
};
|
|
9
|
+
return function (d, b) {
|
|
10
|
+
extendStatics(d, b);
|
|
11
|
+
function __() { this.constructor = d; }
|
|
12
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
13
|
+
};
|
|
14
|
+
})();
|
|
15
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
16
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
17
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
18
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
19
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
20
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
21
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
22
|
+
});
|
|
23
|
+
};
|
|
24
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
25
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
26
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
27
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
28
|
+
function step(op) {
|
|
29
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
30
|
+
while (_) try {
|
|
31
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
32
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
33
|
+
switch (op[0]) {
|
|
34
|
+
case 0: case 1: t = op; break;
|
|
35
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
36
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
37
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
38
|
+
default:
|
|
39
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
40
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
41
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
42
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
43
|
+
if (t[2]) _.ops.pop();
|
|
44
|
+
_.trys.pop(); continue;
|
|
45
|
+
}
|
|
46
|
+
op = body.call(thisArg, _);
|
|
47
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
48
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
52
|
+
exports.MarkupFileInstrumentationStratagy = void 0;
|
|
53
|
+
var fs_1 = require("fs");
|
|
54
|
+
var MarkupFileParser = require("../../markup-files-parser");
|
|
55
|
+
var js_instrumnetation_stratagy_1 = require("./js-instrumnetation-stratagy");
|
|
56
|
+
var MarkupFileInstrumentationStratagy = /** @class */ (function (_super) {
|
|
57
|
+
__extends(MarkupFileInstrumentationStratagy, _super);
|
|
58
|
+
function MarkupFileInstrumentationStratagy() {
|
|
59
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
60
|
+
}
|
|
61
|
+
MarkupFileInstrumentationStratagy.prototype.instrumentFile = function (inputFile, outputFile, fileKey) {
|
|
62
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
63
|
+
var singleMarkupFileInstrumenter, content, instrumentedJsContent, instrumentedContent;
|
|
64
|
+
return __generator(this, function (_a) {
|
|
65
|
+
switch (_a.label) {
|
|
66
|
+
case 0:
|
|
67
|
+
singleMarkupFileInstrumenter = new SingleMarkupFileInstrumenter(this.logger);
|
|
68
|
+
return [4 /*yield*/, singleMarkupFileInstrumenter.extractScripts(inputFile)];
|
|
69
|
+
case 1:
|
|
70
|
+
_a.sent();
|
|
71
|
+
if (!singleMarkupFileInstrumenter.hasJsInFile()) {
|
|
72
|
+
// TODO: return CustomError or object
|
|
73
|
+
throw new Error('No script tags. Nothing to instrument');
|
|
74
|
+
}
|
|
75
|
+
singleMarkupFileInstrumenter.markScripts();
|
|
76
|
+
content = singleMarkupFileInstrumenter.getAllJsInFile();
|
|
77
|
+
instrumentedJsContent = this.instrumenter.instrumentContent(content, fileKey);
|
|
78
|
+
instrumentedContent = this.replaceOldJsByInstrumented(singleMarkupFileInstrumenter.originalFileContent, singleMarkupFileInstrumenter.originalScriptTags, instrumentedJsContent);
|
|
79
|
+
instrumentedContent = this.insertCoverageCodeTag(instrumentedContent, instrumentedJsContent);
|
|
80
|
+
instrumentedContent = this.postInstrumentation(instrumentedContent, fileKey);
|
|
81
|
+
return [4 /*yield*/, fs_1.promises.writeFile(outputFile, instrumentedContent, 'utf8')];
|
|
82
|
+
case 2:
|
|
83
|
+
_a.sent();
|
|
84
|
+
return [2 /*return*/];
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
};
|
|
89
|
+
MarkupFileInstrumentationStratagy.prototype.replaceOldJsByInstrumented = function (originalFileContent, originalScriptTags, instrumentedContent) {
|
|
90
|
+
var instrumentedFileContent = originalFileContent;
|
|
91
|
+
for (var i = 0; i < originalScriptTags.length; i++) {
|
|
92
|
+
var currentTag = originalScriptTags[i];
|
|
93
|
+
var scriptMarker = createScriptMarker(i);
|
|
94
|
+
var scriptStartIndex = instrumentedContent.indexOf(scriptMarker);
|
|
95
|
+
scriptStartIndex += scriptMarker.length;
|
|
96
|
+
var scriptEndIndex = instrumentedContent.lastIndexOf(scriptMarker);
|
|
97
|
+
var instrumentedScript = instrumentedContent.substring(scriptStartIndex, scriptEndIndex);
|
|
98
|
+
instrumentedFileContent = instrumentedFileContent.replace(currentTag.content, instrumentedScript);
|
|
99
|
+
}
|
|
100
|
+
return instrumentedFileContent;
|
|
101
|
+
};
|
|
102
|
+
MarkupFileInstrumentationStratagy.prototype.insertCoverageCodeTag = function (fileContent, instrumentedJsContent) {
|
|
103
|
+
var firstTagMarker = createScriptMarker(0);
|
|
104
|
+
var firstTagStart = instrumentedJsContent.indexOf(firstTagMarker);
|
|
105
|
+
var istanbulCoverageCode = instrumentedJsContent.substring(0, firstTagStart);
|
|
106
|
+
var coverageCodeTag = "<script>\n\t" + istanbulCoverageCode + "\n</script>\n";
|
|
107
|
+
return this.insertTagAtBeginning(coverageCodeTag, fileContent);
|
|
108
|
+
};
|
|
109
|
+
MarkupFileInstrumentationStratagy.prototype.addPreamble = function (instrumentedContent) {
|
|
110
|
+
var preambleTag = "<script>\n\t" + this.preamble.join('\n') + "\n</script>\n";
|
|
111
|
+
return this.insertTagAtBeginning(preambleTag, instrumentedContent);
|
|
112
|
+
};
|
|
113
|
+
MarkupFileInstrumentationStratagy.prototype.insertTagAtBeginning = function (newTag, instrumentedContent) {
|
|
114
|
+
var firstScriptTagIndex = instrumentedContent.search(/<script[\s\S]*?>/);
|
|
115
|
+
return instrumentedContent.slice(0, firstScriptTagIndex) + newTag +
|
|
116
|
+
instrumentedContent.slice(firstScriptTagIndex);
|
|
117
|
+
};
|
|
118
|
+
return MarkupFileInstrumentationStratagy;
|
|
119
|
+
}(js_instrumnetation_stratagy_1.JsFileInstrumentationStratagy));
|
|
120
|
+
exports.MarkupFileInstrumentationStratagy = MarkupFileInstrumentationStratagy;
|
|
121
|
+
var SingleMarkupFileInstrumenter = /** @class */ (function () {
|
|
122
|
+
function SingleMarkupFileInstrumenter(logger) {
|
|
123
|
+
this.logger = logger;
|
|
124
|
+
this.originalScriptTags = [];
|
|
125
|
+
}
|
|
126
|
+
SingleMarkupFileInstrumenter.prototype.extractScripts = function (inputFile) {
|
|
127
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
128
|
+
var _a;
|
|
129
|
+
return __generator(this, function (_b) {
|
|
130
|
+
switch (_b.label) {
|
|
131
|
+
case 0:
|
|
132
|
+
_a = this;
|
|
133
|
+
return [4 /*yield*/, fs_1.promises.readFile(inputFile, 'utf8')];
|
|
134
|
+
case 1:
|
|
135
|
+
_a.originalFileContent = _b.sent();
|
|
136
|
+
this.fileParser = new MarkupFileParser(this.originalFileContent, inputFile, this.logger);
|
|
137
|
+
this.fileParser.extractScriptTags();
|
|
138
|
+
this.originalScriptTags = cloneTagsArray(this.fileParser.scriptTags);
|
|
139
|
+
return [2 /*return*/];
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
};
|
|
144
|
+
SingleMarkupFileInstrumenter.prototype.hasJsInFile = function () {
|
|
145
|
+
return this.fileParser.scriptTags.length !== 0 && isJSEmbeddedInFile(this.fileParser);
|
|
146
|
+
};
|
|
147
|
+
SingleMarkupFileInstrumenter.prototype.markScripts = function () {
|
|
148
|
+
this.fileParser.scriptTags = this.fileParser.scriptTags.map(function (scriptTag, index) {
|
|
149
|
+
var slComment = createScriptMarker(index);
|
|
150
|
+
scriptTag.content = slComment + scriptTag.content + slComment;
|
|
151
|
+
return scriptTag;
|
|
152
|
+
});
|
|
153
|
+
};
|
|
154
|
+
SingleMarkupFileInstrumenter.prototype.getAllJsInFile = function () {
|
|
155
|
+
return this.fileParser.getAllJsInFile();
|
|
156
|
+
};
|
|
157
|
+
return SingleMarkupFileInstrumenter;
|
|
158
|
+
}());
|
|
159
|
+
// Checks if the js code is inside file or loaded from external js file (ie <script src="..."></script>).
|
|
160
|
+
function isJSEmbeddedInFile(fileParser) {
|
|
161
|
+
return fileParser.getAllJsInFile() !== '';
|
|
162
|
+
}
|
|
163
|
+
function createScriptMarker(index) {
|
|
164
|
+
return "/********** SL tag no " + index + " **********/";
|
|
165
|
+
}
|
|
166
|
+
// Because we add mark comments to tag scripts we want to save the original without any changes so we implement deep copy.
|
|
167
|
+
function cloneTagsArray(tagsArray) {
|
|
168
|
+
return JSON.parse(JSON.stringify(tagsArray));
|
|
169
|
+
}
|
|
170
|
+
//# sourceMappingURL=markup-instrumnetation-stratagy.js.map
|
package/tsOutputs/build-scanner/instrumentation/stratagies/markup-instrumnetation-stratagy.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"markup-instrumnetation-stratagy.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/stratagies/markup-instrumnetation-stratagy.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,30 +79,35 @@ var BaseExecutor = /** @class */ (function () {
|
|
|
79
79
|
result = true;
|
|
80
80
|
_a.label = 1;
|
|
81
81
|
case 1:
|
|
82
|
-
_a.trys.push([1,
|
|
82
|
+
_a.trys.push([1, 8, 9, 10]);
|
|
83
83
|
result = this.validateArgs(args);
|
|
84
|
-
if (!result) return [3 /*break*/,
|
|
84
|
+
if (!result) return [3 /*break*/, 7];
|
|
85
85
|
return [4 /*yield*/, this.resolveBaseData(args)];
|
|
86
86
|
case 2:
|
|
87
87
|
_a.sent();
|
|
88
|
-
this.notifyAgentStarted(agent_instance_data_1.agentInstanceData, args);
|
|
89
|
-
return [4 /*yield*/, this.innerExecute(args, extraArgs)];
|
|
88
|
+
return [4 /*yield*/, this.notifyAgentStarted(agent_instance_data_1.agentInstanceData, args)];
|
|
90
89
|
case 3:
|
|
91
|
-
|
|
92
|
-
return [4 /*yield*/, this.
|
|
90
|
+
_a.sent();
|
|
91
|
+
return [4 /*yield*/, this.getRemoteConfigFromServer(this._baseData)];
|
|
93
92
|
case 4:
|
|
94
93
|
_a.sent();
|
|
95
|
-
|
|
96
|
-
case 5:
|
|
94
|
+
return [4 /*yield*/, this.innerExecute(args, extraArgs)];
|
|
95
|
+
case 5:
|
|
96
|
+
result = _a.sent();
|
|
97
|
+
return [4 /*yield*/, this.notifyAgentShutdown()];
|
|
97
98
|
case 6:
|
|
99
|
+
_a.sent();
|
|
100
|
+
_a.label = 7;
|
|
101
|
+
case 7: return [3 /*break*/, 10];
|
|
102
|
+
case 8:
|
|
98
103
|
e_1 = _a.sent();
|
|
99
104
|
console.error("[sealights] " + e_1.message);
|
|
100
105
|
result = false;
|
|
101
|
-
return [3 /*break*/,
|
|
102
|
-
case
|
|
106
|
+
return [3 /*break*/, 10];
|
|
107
|
+
case 9:
|
|
103
108
|
this.exitProcess(result, args.failbuild);
|
|
104
109
|
return [7 /*endfinally*/];
|
|
105
|
-
case
|
|
110
|
+
case 10: return [2 /*return*/];
|
|
106
111
|
}
|
|
107
112
|
});
|
|
108
113
|
});
|
|
@@ -226,38 +231,36 @@ var BaseExecutor = /** @class */ (function () {
|
|
|
226
231
|
});
|
|
227
232
|
});
|
|
228
233
|
};
|
|
229
|
-
BaseExecutor.prototype.getRemoteConfigFromServer = function (
|
|
234
|
+
BaseExecutor.prototype.getRemoteConfigFromServer = function (agentBaseData) {
|
|
230
235
|
return __awaiter(this, void 0, void 0, function () {
|
|
231
|
-
var
|
|
232
|
-
return __generator(this, function (
|
|
233
|
-
switch (
|
|
236
|
+
var backendProxy, _a, e_4;
|
|
237
|
+
return __generator(this, function (_b) {
|
|
238
|
+
switch (_b.label) {
|
|
234
239
|
case 0:
|
|
235
|
-
|
|
236
|
-
|
|
240
|
+
_b.trys.push([0, 2, , 3]);
|
|
241
|
+
backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, agentBaseData, this.logger);
|
|
242
|
+
_a = this;
|
|
243
|
+
return [4 /*yield*/, backendProxy.getRemoteConfigPromise(agentBaseData)];
|
|
237
244
|
case 1:
|
|
238
|
-
_a.
|
|
239
|
-
|
|
240
|
-
return [
|
|
245
|
+
_a.agentRemoteConfig = (_b.sent()) || {};
|
|
246
|
+
this.notifyConfigurationChanged(agentBaseData);
|
|
247
|
+
return [3 /*break*/, 3];
|
|
241
248
|
case 2:
|
|
242
|
-
|
|
243
|
-
return [3 /*break*/, 5];
|
|
244
|
-
case 3:
|
|
245
|
-
e_4 = _a.sent();
|
|
249
|
+
e_4 = _b.sent();
|
|
246
250
|
this.logger.warn("Failed to receive remote config, error: '" + e_4 + "'. Using init config from cmd args and env vars");
|
|
247
|
-
|
|
248
|
-
return [3 /*break*/,
|
|
249
|
-
case
|
|
250
|
-
this.notifyConfigurationChanged(remoteConfig, cmdArgs);
|
|
251
|
-
return [2 /*return*/, remoteConfig];
|
|
252
|
-
case 5: return [2 /*return*/];
|
|
251
|
+
this.agentRemoteConfig = {};
|
|
252
|
+
return [3 /*break*/, 3];
|
|
253
|
+
case 3: return [2 /*return*/];
|
|
253
254
|
}
|
|
254
255
|
});
|
|
255
256
|
});
|
|
256
257
|
};
|
|
257
|
-
BaseExecutor.prototype.notifyConfigurationChanged = function (
|
|
258
|
-
if (Object.keys(
|
|
259
|
-
var agentConfig = new config_loader_1.ConfigLoader().loadAgentConfiguration(
|
|
260
|
-
var eventData = {
|
|
258
|
+
BaseExecutor.prototype.notifyConfigurationChanged = function (cmdArgs) {
|
|
259
|
+
if (Object.keys(this.agentRemoteConfig).length > 0) {
|
|
260
|
+
var agentConfig = new config_loader_1.ConfigLoader().loadAgentConfiguration(cmdArgs);
|
|
261
|
+
var eventData = {
|
|
262
|
+
agentConfig: __assign(__assign({}, agentConfig.toJsonObject()), this.agentRemoteConfig),
|
|
263
|
+
};
|
|
261
264
|
cockpit_notifier_1.CockpitNotifier.sendEvent(agent_events_conracts_1.AgentEventCode.AGENT_CONFIG_CHANGED, eventData);
|
|
262
265
|
}
|
|
263
266
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4EAAuE;AACvE,iEAA6D;AAC7D,4FAAsF;AACtF,yDAAmF;AACnF,6DAAyD;AACzD,8DAAyD;AACzD,kCAA2C;AAC3C,+EAA2E;AAE3E,yFAA+E;
|
|
1
|
+
{"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,18 +102,12 @@ var BuildExecutor = /** @class */ (function (_super) {
|
|
|
102
102
|
};
|
|
103
103
|
BuildExecutor.prototype.setConfigFromRemote = function (mappedArgs) {
|
|
104
104
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
|
-
var remoteConfig;
|
|
106
105
|
return __generator(this, function (_a) {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
remoteConfig = _a.sent();
|
|
111
|
-
mappedArgs.useRelativeSlMapping = remoteConfig.useRelativeSlMapping || false;
|
|
112
|
-
if (mappedArgs.useRelativeSlMapping) {
|
|
113
|
-
cockpit_notifier_1.CockpitNotifier.sendGenericMessage('Relative sl-mapping feature was turned on');
|
|
114
|
-
}
|
|
115
|
-
return [2 /*return*/];
|
|
106
|
+
mappedArgs.useRelativeSlMapping = this.agentRemoteConfig.useRelativeSlMapping || false;
|
|
107
|
+
if (mappedArgs.useRelativeSlMapping) {
|
|
108
|
+
cockpit_notifier_1.CockpitNotifier.sendGenericMessage('Relative sl-mapping feature was turned on');
|
|
116
109
|
}
|
|
110
|
+
return [2 /*return*/];
|
|
117
111
|
});
|
|
118
112
|
});
|
|
119
113
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA6C;AAG7C,+CAA2C;AAC3C,wEAAmE;AACnE,yFAAsF;AACtF,kCAAqC;AACrC,mDAA8C;AAC9C,+EAA2E;AAC3E,8BAAkC;AAElC;IAAmC,iCAAwC;IAA3E;QAAA,
|
|
1
|
+
{"version":3,"file":"build-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,17 +75,11 @@ var NycReportExecutor = /** @class */ (function (_super) {
|
|
|
75
75
|
}
|
|
76
76
|
NycReportExecutor.prototype.innerExecute = function (args) {
|
|
77
77
|
return __awaiter(this, void 0, void 0, function () {
|
|
78
|
-
var nycReportData,
|
|
78
|
+
var nycReportData, agentConfig;
|
|
79
79
|
return __generator(this, function (_a) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
return [4 /*yield*/, this.getRemoteConfigFromServer(nycReportData)];
|
|
84
|
-
case 1:
|
|
85
|
-
remoteConfig = _a.sent();
|
|
86
|
-
agentConfig = utils_1.createAgentConfig(__assign(__assign({}, nycReportData), remoteConfig));
|
|
87
|
-
return [2 /*return*/, api_1.uploadNycReport(args.report, agentConfig, agent_instance_data_1.agentInstanceData)];
|
|
88
|
-
}
|
|
80
|
+
nycReportData = this.mapArgs(args);
|
|
81
|
+
agentConfig = utils_1.createAgentConfig(__assign(__assign({}, nycReportData), this.agentRemoteConfig));
|
|
82
|
+
return [2 /*return*/, api_1.uploadNycReport(args.report, agentConfig, agent_instance_data_1.agentInstanceData)];
|
|
89
83
|
});
|
|
90
84
|
});
|
|
91
85
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nyc-report-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/nyc-report-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA6C;AAE7C,6BAA6B;AAC7B,kCAA2C;AAC3C,+CAAwD;AACxD,8DAAyD;AAEzD;IAAuC,qCAA4C;IAAnF;QAAA,
|
|
1
|
+
{"version":3,"file":"nyc-report-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/nyc-report-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA6C;AAE7C,6BAA6B;AAC7B,kCAA2C;AAC3C,+CAAwD;AACxD,8DAAyD;AAEzD;IAAuC,qCAA4C;IAAnF;QAAA,qEA4BC;QAvBa,iBAAW,GAAG,WAAW,CAAC;;IAuBxC,CAAC;IArBgB,wCAAY,GAAzB,UAA0B,IAAoB;;;;gBACpC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnC,WAAW,GAAG,yBAAiB,uBAAK,aAAa,GAAK,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACrF,sBAAO,qBAAe,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,uCAAiB,CAAC,EAAC;;;KACvE;IAEM,mCAAO,GAAd,UAAe,IAAoB;QAC/B,6BACO,IAAI,CAAC,QAAQ,KAChB,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAChC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAC9B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,IACpD;IAEL,CAAC;IAED,kBAAkB;IACX,uCAAW,GAAlB,UAAmB,QAAmB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IA1Bc,8CAA4B,GAAG,qBAAqB,CAAC;IACrD,iCAAe,GAAG,UAAU,CAAC;IAC9B,6CAA2B,GAAG,cAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,eAAe,EAAE,iBAAiB,CAAC,4BAA4B,CAAC,CAAC;IAyBhJ,wBAAC;CAAA,AA5BD,CAAuC,4BAAY,GA4BlD;AA5BY,8CAAiB"}
|
|
@@ -78,24 +78,17 @@ var TestListenerExecutor = /** @class */ (function (_super) {
|
|
|
78
78
|
return __assign(__assign(__assign({}, args), this.baseData), { appname: this.baseData.appName, build: this.baseData.buildName, branch: this.baseData.branchName, labid: args.labid || this.baseData.buildSessionId, buildsessionid: this.baseData.buildSessionId });
|
|
79
79
|
};
|
|
80
80
|
TestListenerExecutor.prototype.innerExecute = function (args, extraArgs) {
|
|
81
|
-
var _a;
|
|
82
81
|
return __awaiter(this, void 0, void 0, function () {
|
|
83
|
-
var
|
|
84
|
-
return __generator(this, function (
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
process.env['SL_httpClientColoring'] = args.httpClientColoring.toString();
|
|
94
|
-
process.env['SL_httpServerColoring'] = args.httpServerColoring.toString();
|
|
95
|
-
if ((_a = this.remoteConfig) === null || _a === void 0 ? void 0 : _a.useOtel)
|
|
96
|
-
sl_env_vars_1.SlEnvVars.turnOtelOn();
|
|
97
|
-
return [2 /*return*/];
|
|
98
|
-
}
|
|
82
|
+
var remoteConfig;
|
|
83
|
+
return __generator(this, function (_a) {
|
|
84
|
+
this.isSLCommandRan = true;
|
|
85
|
+
remoteConfig = this.agentRemoteConfig;
|
|
86
|
+
this.saveConfigurationToProcessEnv(__assign(__assign({}, this.mapArgs(args)), remoteConfig));
|
|
87
|
+
process.env['SL_httpClientColoring'] = args.httpClientColoring.toString();
|
|
88
|
+
process.env['SL_httpServerColoring'] = args.httpServerColoring.toString();
|
|
89
|
+
if (remoteConfig.useOtel)
|
|
90
|
+
sl_env_vars_1.SlEnvVars.turnOtelOn();
|
|
91
|
+
return [2 /*return*/];
|
|
99
92
|
});
|
|
100
93
|
});
|
|
101
94
|
};
|