slnodejs 6.1.615 → 6.1.627

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.
Files changed (80) hide show
  1. package/browser-agent/dist/browser-agent-all.js +12075 -106857
  2. package/browser-agent/dist/browser-agent-all.min.js +3 -14
  3. package/browser-agent/package.json +5 -5
  4. package/package.json +4 -4
  5. package/tsOutputs/api.js +2 -2
  6. package/tsOutputs/build-scanner/cia.js +3 -2
  7. package/tsOutputs/build-scanner/cia.js.map +1 -1
  8. package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js +1 -0
  9. package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js.map +1 -1
  10. package/tsOutputs/build-scanner/instrumentation/files-instrumenter.d.ts +1 -0
  11. package/tsOutputs/build-scanner/instrumentation/files-instrumenter.js.map +1 -1
  12. package/tsOutputs/build-scanner/instrumentation/instrumented-file-size-reducer.js +23 -13
  13. package/tsOutputs/build-scanner/instrumentation/instrumented-file-size-reducer.js.map +1 -1
  14. package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.d.ts +1 -0
  15. package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.js +3 -3
  16. package/tsOutputs/build-scanner/instrumentation/strategies/js-instrumnetation-strategy.js.map +1 -1
  17. package/tsOutputs/cli-parse/executors/base-executor.js +9 -8
  18. package/tsOutputs/cli-parse/executors/base-executor.js.map +1 -1
  19. package/tsOutputs/cli-parse/executors/build-end-executor.js +3 -3
  20. package/tsOutputs/cli-parse/executors/build-end-executor.js.map +1 -1
  21. package/tsOutputs/cli-parse/executors/config-executor.js +4 -4
  22. package/tsOutputs/cli-parse/executors/config-executor.js.map +1 -1
  23. package/tsOutputs/cli-parse/executors/integration-build-components-executor.js +2 -2
  24. package/tsOutputs/cli-parse/executors/integration-build-components-executor.js.map +1 -1
  25. package/tsOutputs/cli-parse/executors/mocha-executor.js +2 -2
  26. package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
  27. package/tsOutputs/cli-parse/executors/pr-config-executor.js +1 -1
  28. package/tsOutputs/cli-parse/executors/pr-config-executor.js.map +1 -1
  29. package/tsOutputs/cli-parse/executors/test-executions-executor.js +2 -2
  30. package/tsOutputs/cli-parse/executors/test-executions-executor.js.map +1 -1
  31. package/tsOutputs/common/agent-events/agent-events-controller.d.ts +3 -4
  32. package/tsOutputs/common/agent-events/agent-events-controller.js +3 -17
  33. package/tsOutputs/common/agent-events/agent-events-controller.js.map +1 -1
  34. package/tsOutputs/common/agent-events/cockpit-notifier.d.ts +2 -3
  35. package/tsOutputs/common/agent-events/cockpit-notifier.js +2 -2
  36. package/tsOutputs/common/agent-events/cockpit-notifier.js.map +1 -1
  37. package/tsOutputs/common/config-process/index.d.ts +2 -2
  38. package/tsOutputs/common/config-process/index.js.map +1 -1
  39. package/tsOutputs/common/constants/sl-env-vars.d.ts +2 -0
  40. package/tsOutputs/common/constants/sl-env-vars.js +4 -0
  41. package/tsOutputs/common/constants/sl-env-vars.js.map +1 -1
  42. package/tsOutputs/common/events-process/index.d.ts +3 -3
  43. package/tsOutputs/common/events-process/index.js.map +1 -1
  44. package/tsOutputs/common/footprints-process-v6/collector-footprints-process.d.ts +2 -2
  45. package/tsOutputs/common/footprints-process-v6/collector-footprints-process.js.map +1 -1
  46. package/tsOutputs/common/footprints-process-v6/index.d.ts +4 -4
  47. package/tsOutputs/common/footprints-process-v6/index.js.map +1 -1
  48. package/tsOutputs/common/http/backend-proxy-interface.d.ts +7 -2
  49. package/tsOutputs/common/http/backend-proxy-with-default-client.d.ts +7 -0
  50. package/tsOutputs/common/http/backend-proxy-with-default-client.js +23 -0
  51. package/tsOutputs/common/http/backend-proxy-with-default-client.js.map +1 -0
  52. package/tsOutputs/common/http/backend-proxy.d.ts +2 -2
  53. package/tsOutputs/common/http/backend-proxy.js +2 -14
  54. package/tsOutputs/common/http/backend-proxy.js.map +1 -1
  55. package/tsOutputs/common/http/dry-run-proxy.js +9 -0
  56. package/tsOutputs/common/http/dry-run-proxy.js.map +1 -1
  57. package/tsOutputs/common/http/http-client.d.ts +6 -5
  58. package/tsOutputs/common/http/http-client.js +8 -5
  59. package/tsOutputs/common/http/http-client.js.map +1 -1
  60. package/tsOutputs/common/no-op-state-tracker.d.ts +2 -2
  61. package/tsOutputs/common/no-op-state-tracker.js.map +1 -1
  62. package/tsOutputs/common/state-tracker.d.ts +3 -3
  63. package/tsOutputs/common/state-tracker.js.map +1 -1
  64. package/tsOutputs/common/utils/build-session-data-builder.d.ts +3 -3
  65. package/tsOutputs/common/utils/build-session-data-builder.js.map +1 -1
  66. package/tsOutputs/test-listener/agent.d.ts +3 -1
  67. package/tsOutputs/test-listener/agent.js +3 -2
  68. package/tsOutputs/test-listener/agent.js.map +1 -1
  69. package/tsOutputs/test-listener/api.js +5 -5
  70. package/tsOutputs/test-listener/api.js.map +1 -1
  71. package/tsOutputs/test-listener/factory.d.ts +3 -3
  72. package/tsOutputs/test-listener/factory.js +4 -4
  73. package/tsOutputs/test-listener/factory.js.map +1 -1
  74. package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
  75. package/tsOutputs/test-listener/remote-agent.d.ts +2 -2
  76. package/tsOutputs/test-listener/remote-agent.js +1 -1
  77. package/tsOutputs/test-listener/remote-agent.js.map +1 -1
  78. package/tsOutputs/test-listener/test-recommendation-handler.d.ts +2 -2
  79. package/tsOutputs/test-listener/test-recommendation-handler.js.map +1 -1
  80. package/tsOutputs/test-listener/upload-report-handler.js.map +1 -1
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sl-browser-agent",
3
- "version": "6.1.615",
3
+ "version": "6.1.627",
4
4
  "description": "le Browser Agent!",
5
5
  "main": "dist/browser-agent-all.js",
6
6
  "browser": {
@@ -23,10 +23,10 @@
23
23
  "test": "../node_modules/.bin/tsc -p ./tsconfig.tests.json && ../node_modules/.bin/mocha build-test/browser-agent/test/unitTest/**/*.js",
24
24
  "prebrowserify": "tsc -p ./tsconfig.browserfiy.json && mkdir -p dist",
25
25
  "prebrowserify:disc": "tsc -p ./tsconfig.browserfiy.json && mkdir -p dist",
26
- "browserify": "node_modules/.bin/browserify tsOutputs/browser-agent/index.js -o ./dist/browser-agent-all.js",
27
- "browserify:disc": "node_modules/.bin/browserify tsOutputs/browser-agent/index.js --full-paths -o ./dist/browser-agent-all.js",
28
- "postbrowserify": "node_modules/.bin/uglifyjs -o ./dist/browser-agent-all.min.js dist/browser-agent-all.js",
29
- "postbrowserify:disc": "node_modules/.bin/uglifyjs -o ./dist/browser-agent-all.min.js dist/browser-agent-all.js && node_modules/.bin/discify ./dist/browser-agent-all.min.js > ./dist/disc.html && open ./dist/disc.html",
26
+ "browserify": "npx browserify tsOutputs/browser-agent/index.js -o ./dist/browser-agent-all.js",
27
+ "browserify:disc": "npx browserify tsOutputs/browser-agent/index.js --full-paths -o ./dist/browser-agent-all.js",
28
+ "postbrowserify": "npx uglifyjs -o ./dist/browser-agent-all.min.js dist/browser-agent-all.js",
29
+ "postbrowserify:disc": "npx uglifyjs -o ./dist/browser-agent-all.min.js dist/browser-agent-all.js && node_modules/.bin/discify ./dist/browser-agent-all.min.js > ./dist/disc.html && open ./dist/disc.html",
30
30
  "tsify": "globify index.ts lib/**/*.ts typings/**/*.ts --debug --standalone agnt -p [ tsify -p ./tsconfig.browserfiy.json ] -o ./dist-debug/browser-agent-all.js"
31
31
  },
32
32
  "repository": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "slnodejs",
3
- "version": "6.1.615",
3
+ "version": "6.1.627",
4
4
  "description": "",
5
5
  "main": "tsOutputs/api.js",
6
6
  "scripts": {
@@ -43,6 +43,7 @@
43
43
  "glob": "8.1.0",
44
44
  "ignore": "5.2.0",
45
45
  "istanbul-lib-instrument": "3.0.0",
46
+ "istanbul-lib-report": "3.0.0",
46
47
  "jwt-decode": "2.2.0",
47
48
  "lightcookie": "1.0.24",
48
49
  "lodash.clonedeep": "^4.5.0",
@@ -63,11 +64,10 @@
63
64
  "sl-esprima-ast-utils": "0.0.7",
64
65
  "source-map": "0.6.1",
65
66
  "table": "6.7.1",
67
+ "triple-beam": "~1.3.0",
66
68
  "util": "0.12.4",
67
69
  "uuid": "3.1.0",
68
- "triple-beam": "~1.3.0",
69
- "winston": "3.8.0",
70
- "istanbul-lib-report": "3.0.0"
70
+ "winston": "3.8.0"
71
71
  },
72
72
  "devDependencies": {
73
73
  "@miovision/eslint-plugin-disallow-date": "2.0.0",
package/tsOutputs/api.js CHANGED
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.createAgentConfig = exports.bsidResolvedFromLabid = exports.cliArgsToAgentConfig = exports.createRemoteAgent = exports.CockpitNotifier = exports.LoggerFactory = exports.slWindowObject = exports.skipBrowserAgentKey = exports.RemoteAgent = exports.getSystemDateValueOf = void 0;
13
13
  const token_data_builder_1 = require("./common/utils/token-data-builder");
14
- const backend_proxy_1 = require("./common/http/backend-proxy");
15
14
  const agent_instance_data_1 = require("./cli-parse/agent-instance-data");
16
15
  const config_loader_1 = require("./common/config-process/config-loader");
17
16
  const logger_1 = require("./common/logger");
@@ -19,6 +18,7 @@ Object.defineProperty(exports, "LoggerFactory", { enumerable: true, get: functio
19
18
  const factory_1 = require("./test-listener/factory");
20
19
  const constants_1 = require("./common/constants/constants");
21
20
  const test_runner_build_session_data_builder_1 = require("./common/utils/test-runner-build-session-data-builder");
21
+ const backend_proxy_with_default_client_1 = require("./common/http/backend-proxy-with-default-client");
22
22
  var system_date_1 = require("./common/system-date");
23
23
  Object.defineProperty(exports, "getSystemDateValueOf", { enumerable: true, get: function () { return system_date_1.getSystemDateValueOf; } });
24
24
  var remote_agent_1 = require("./test-listener/remote-agent");
@@ -44,7 +44,7 @@ function cliArgsToAgentConfig(cliArgs) {
44
44
  throw new Error('Token is not valid');
45
45
  }
46
46
  const httpConfig = Object.assign(Object.assign({}, tokenData), { proxy: cliArgs.proxy });
47
- const backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, httpConfig, logger);
47
+ const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, httpConfig, logger);
48
48
  const buildSessionData = yield new test_runner_build_session_data_builder_1.TestRunnerBuildSessionDataBuilder(backendProxy).build(cliArgs);
49
49
  if (!buildSessionData) {
50
50
  throw new Error('could not resolve build session data');
@@ -1,5 +1,6 @@
1
- var BuildDiffProcess = require("./build-diff-process.js").BuildDiffProcess, LoggerFactory = require("../common/logger").LoggerFactory, expandCommaSeparatedValues = require('./utils').expandCommaSeparatedValues, BackendProxy = require("../common/http/backend-proxy").BackendProxy, ScmFactory = require("../common/scm/scm-factory").ScmFactory, DependencyUtils = require("../common/utils/dependency-utils").DependencyUtils, DefaultValuesResolver = require('./default-values-resolver'), agentInstanceData = require('./current-agent-instance'), utils = require('./utils.js'), BuildScanDiagnosis = require('./diagnostic').BuildScanDiagnosis, DryRunDiagnosis = require('./diagnostic').DryRunDiagnosis, // should be changed
1
+ var BuildDiffProcess = require("./build-diff-process.js").BuildDiffProcess, LoggerFactory = require("../common/logger").LoggerFactory, expandCommaSeparatedValues = require('./utils').expandCommaSeparatedValues, ScmFactory = require("../common/scm/scm-factory").ScmFactory, DependencyUtils = require("../common/utils/dependency-utils").DependencyUtils, DefaultValuesResolver = require('./default-values-resolver'), agentInstanceData = require('./current-agent-instance'), utils = require('./utils.js'), BuildScanDiagnosis = require('./diagnostic').BuildScanDiagnosis, DryRunDiagnosis = require('./diagnostic').DryRunDiagnosis, // should be changed
2
2
  NoneDiagnosis = require('./diagnostic').NoneDiagnosis;
3
+ BackendProxyFactory = require("../common/http/backend-proxy-with-default-client").BackendProxyFactory;
3
4
  function CIA() {
4
5
  }
5
6
  CIA.prototype.run = function run(buildArguments, callback) {
@@ -11,7 +12,7 @@ CIA.prototype.run = function run(buildArguments, callback) {
11
12
  printConfiguration(buildArguments, logger);
12
13
  try {
13
14
  var parsedDependencies = context._tryParseDependenciesForIntegrationBuild(buildArguments, logger);
14
- var buildMappingProxy = new BackendProxy(agentInstanceData, buildArguments, logger);
15
+ var buildMappingProxy = BackendProxyFactory.initWithDefaultClient(agentInstanceData, buildArguments, logger);
15
16
  context.runBuildDiffProcess(buildMappingProxy, parsedDependencies, buildArguments, logger, callback);
16
17
  }
17
18
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"cia.js","sourceRoot":"","sources":["../../build-scanner/cia.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cia.js","sourceRoot":"","sources":["../../build-scanner/cia.js"],"names":[],"mappings":"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"}
@@ -212,6 +212,7 @@ BrowserInstrumenter.prototype._processFiles = function (callback) {
212
212
  extensionsToInstrument: this.opts.extensionsToInstrument,
213
213
  shouldMinifyInstrumentedOutput: CiaEnvVars.minifyInstrumentedOutput(),
214
214
  shouldReduceInstrumentedFileSize: CiaEnvVars.reduceInstrumentedFileSize(),
215
+ omitInstrumentedFunctionMap: CiaEnvVars.omitInstrumentedFunctionMap(),
215
216
  experimentalSizeReduction,
216
217
  useBranchCoverage: this.opts.usebranchcoverage,
217
218
  babylonPlugins: this.opts.babylonPlugins || [],
@@ -1 +1 @@
1
- {"version":3,"file":"browser-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/browser-instrumenter.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/browser-instrumenter.js"],"names":[],"mappings":"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"}
@@ -9,6 +9,7 @@ export interface IFilesInstrumenterParams {
9
9
  workspacePath: string;
10
10
  shouldMinifyInstrumentedOutput: boolean;
11
11
  shouldReduceInstrumentedFileSize: boolean;
12
+ omitInstrumentedFunctionMap: boolean;
12
13
  useBranchCoverage: boolean;
13
14
  babylonPlugins: boolean;
14
15
  excludeSourceMapFiles: string;
@@ -1 +1 @@
1
- {"version":3,"file":"files-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/files-instrumenter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAA6B;AAC7B,mCAA8B;AAC9B,yBAAyB;AACzB,+DAAgE;AAChE,8EAAuE;AAEvE,kCAAmC;AACnC,iEAA6D;AAE7D,0EAAoE;AACpE,0FAAyF;AACzF,kGAAiG;AACjG,0EAAsE;AACtE,0DAAsE;AAgCtE,MAAa,iBAAiB;IAY1B,YACY,MAAgC,EAChC,cAAwB,EACxB,MAAc,EACd,eAA0C;QAH1C,WAAM,GAAN,MAAM,CAA0B;QAChC,mBAAc,GAAd,cAAc,CAAU;QACxB,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAA2B;QAGlD,kCAAe,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvD,kCAAe,CAAC,oBAAoB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACvE,kCAAe,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACvD,kCAAe,CAAC,oBAAoB,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;QAEzE,IAAI,CAAC,gBAAgB,GAAG,gCAAsB,CAAC,2BAA2B,CAAC,MAAM,CAAC,qBAAqB,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;QACtI,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,2CAAmB,CAAC,qBAAqB,CAAC,CAAC;QAE/F,IAAI,CAAC,YAAY,GAAG,IAAI,0CAAmB,CAAC;YACxC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,6BAA6B,GAAG,IAAI,2DAA6B,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1J,IAAI,CAAC,iCAAiC,GAAG,IAAI,mEAAiC,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACtK,CAAC;IAEO,mBAAmB,CAAC,cAAc;QACtC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAClI,OAAO,IAAI,2CAAmB,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9G,CAAC;IAEY,sBAAsB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,KAAK;;YACrE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;YAElD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAE7G,MAAM,yBAAyB,GAA+B;gBAC1D,QAAQ,EAAE,OAAO;gBACjB,cAAc,EAAE,KAAK;gBACrB,sBAAsB,EAAE,KAAK;gBAC7B,2BAA2B,EAAE,IAAI;gBACjC,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,KAAK;gBAClB,gBAAgB,EAAE,IAAI;aACzB,CAAA;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC3C,eAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEvB,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;gBACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,SAAS,sCAAsC,CAAC,CAAC;gBACjF,OAAO,yBAAyB,CAAC;aACpC;YAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;YAC1H,MAAM,oBAAoB,GAAG,gBAAgB,IAAI,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC;YAEjH,IAAG,oBAAoB,EAAC;gBACpB,IAAI;oBACA,IAAG,KAAK,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAC;wBACtC,MAAM,IAAI,CAAC,iCAAiC,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;qBACxF;yBAAM;wBACH,MAAM,IAAI,CAAC,6BAA6B,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;qBACpF;oBAED,yBAAyB,CAAC,cAAc,GAAG,IAAI,CAAC;oBAChD,OAAO,yBAAyB,CAAC;iBACpC;gBAAC,OAAM,KAAK,EAAC;oBACV,MAAM,UAAU,GAAG,GAAG,KAAK,CAAC,OAAO,WAAW,QAAQ,YAAY,KAAK,EAAE,CAAC;oBAC1E,yBAAyB,CAAC,2BAA2B,GAAG,UAAU,CAAC;oBACnE,yBAAyB,CAAC,sBAAsB,GAAG,IAAI,CAAC;iBAC3D;aACJ;YAED,IAAG,CAAC,oBAAoB,IAAI,yBAAyB,CAAC,sBAAsB,EAAC;gBACzE,IAAI;oBACA,IAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAC;wBAChD,MAAM,IAAI,KAAK,CAAC,6CAA6C,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAA;qBAC7F;oBAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;oBAEpE,yBAAyB,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC1C,OAAO,yBAAyB,CAAC;iBACpC;gBAAC,OAAM,KAAK,EAAC;oBACV,MAAM,UAAU,GAAG,GAAG,KAAK,CAAC,OAAO,WAAW,QAAQ,YAAY,KAAK,EAAE,CAAC;oBAC1E,yBAAyB,CAAC,gBAAgB,GAAG,UAAU,CAAC;oBACxD,yBAAyB,CAAC,WAAW,GAAG,IAAI,CAAC;iBAChD;aACJ;YACD,OAAO,yBAAyB,CAAC;QACrC,CAAC;KAAA;IAEO,YAAY,CAAC,QAAgB;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEO,aAAa,CAAC,QAAgB;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEO,wBAAwB,CAAC,QAAgB;QAC7C,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,QAAQ,8CAA8C,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA5HD,8CA4HC"}
1
+ {"version":3,"file":"files-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/files-instrumenter.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ var astTypes = require("ast-types");
4
4
  var plugins = ["*", ["decorators", { decoratorsBeforeExport: true }]];
5
5
  var updateStatementCoverageCommand = ".s\\[\\d+\\]\\++";
6
6
  var updateBranchCoverageCommand = ".b\\[\\d+\\]\\[\\d+\\]\\++";
7
+ var updateFnMapCoverageCommand = "\\.fnMap\\[\\d+\\]\\++";
7
8
  var propNameToShort = {
8
9
  start: "st",
9
10
  end: "e",
@@ -15,15 +16,16 @@ var propNameToShort = {
15
16
  type: "t",
16
17
  locations: "lcs"
17
18
  };
18
- function reduceContentSize(filename, instrumentedCode, babylonPlugins, shouldRemoveBranchCoverage, shouldMinifyOutput, logger, cockpitNotifier, useExperimentalSizeReduction) {
19
+ function reduceContentSize(filename, instrumentedCode, babylonPlugins, shouldRemoveBranchCoverage, shouldMinifyOutput, logger, cockpitNotifier, useExperimentalSizeReduction, omitInstrumentedFunctionMap) {
19
20
  try {
20
21
  var ast = createAST(instrumentedCode, babylonPlugins);
21
22
  var coverageObjectNode = getCoverageObjectNode(ast);
22
23
  var coverageObjectName = coverageObjectNode.id.name;
23
- reduceCoverageObjectSize(coverageObjectNode, shouldRemoveBranchCoverage);
24
+ reduceCoverageObjectSize(coverageObjectNode, shouldRemoveBranchCoverage, omitInstrumentedFunctionMap);
24
25
  var updateStatementCoverageRegEx = new RegExp(coverageObjectName + updateStatementCoverageCommand);
25
26
  var updateBranchCoverageRegEx = new RegExp(coverageObjectName + updateBranchCoverageCommand);
26
- removeRedundantUpdateCommands(ast, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx);
27
+ var updateFnMapCoverageCommand = new RegExp(coverageObjectName + updateFnMapCoverageCommand);
28
+ removeRedundantUpdateCommands(ast, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx, omitInstrumentedFunctionMap, updateFnMapCoverageCommand);
27
29
  var finalContent = parseASTToCode(ast, shouldMinifyOutput);
28
30
  if (useExperimentalSizeReduction) {
29
31
  // TODO: remove after proper fix
@@ -34,7 +36,7 @@ function reduceContentSize(filename, instrumentedCode, babylonPlugins, shouldRem
34
36
  // https://regex101.com/r/kcnNgg/1 - exclude matches in strings and names
35
37
  finalContent = finalContent.replace(/(?<=class\s+(\S+\s+)?(?:extends\s+\S+\s+)?)implements(?=\s*\{)/g, '').replace(/\}implements\{/g, '}{');
36
38
  }
37
- validateFinalContent(finalContent, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx);
39
+ validateFinalContent(finalContent, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx, omitInstrumentedFunctionMap, updateFnMapCoverageCommand);
38
40
  return finalContent;
39
41
  }
40
42
  catch (e) {
@@ -50,14 +52,17 @@ function verifyUpdateCoverageRemoved(finalContent, updateStatementCoverageRegEx,
50
52
  throw new Error("Expected all " + coverageElement + " related expression to be removed");
51
53
  }
52
54
  }
53
- function validateFinalContent(finalContent, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx) {
55
+ function validateFinalContent(finalContent, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx, omitInstrumentedFunctionMap, updateFnMapCoverageCommand) {
54
56
  verifyUpdateCoverageRemoved(finalContent, updateStatementCoverageRegEx, "statement");
55
57
  if (shouldRemoveBranchCoverage) {
56
58
  verifyUpdateCoverageRemoved(finalContent, updateBranchCoverageRegEx, "branch");
57
59
  }
60
+ if (omitInstrumentedFunctionMap) {
61
+ verifyUpdateCoverageRemoved(finalContent, updateFnMapCoverageCommand, "function map");
62
+ }
58
63
  }
59
- function shouldConvertToEmptyObject(path, shouldRemoveBranchCoverage) {
60
- return isStatementCoverageRelatedObject(path.value) || (shouldRemoveBranchCoverage && isBranchCoverageRelatedObject(path.value));
64
+ function shouldConvertToEmptyObject(path, shouldRemoveBranchCoverage, omitInstrumentedFunctionMap) {
65
+ return isStatementCoverageRelatedObject(path.value) || (shouldRemoveBranchCoverage && isBranchCoverageRelatedObject(path.value)) || (omitInstrumentedFunctionMap && isFunctionMapCoverageRelatedObject(path.value));
61
66
  }
62
67
  function shouldUseShortPropNames(path, shouldRemoveBranchCoverage) {
63
68
  if (path && path.key && path.key.name) {
@@ -65,8 +70,9 @@ function shouldUseShortPropNames(path, shouldRemoveBranchCoverage) {
65
70
  }
66
71
  return isStatementCoverageRelatedObject(path.value) || (shouldRemoveBranchCoverage && isBranchCoverageRelatedObject(path.value));
67
72
  }
68
- function nodeShouldBeDeleted(path, updateStatementCoverageRegEx, shouldRemoveBranchCoverage, updateBranchCoverageRegEx) {
69
- return isStatementCoverageUpdateExpresion(path.node, updateStatementCoverageRegEx) || (shouldRemoveBranchCoverage && isBranchCoverageUpdateExpresion(path.node, updateBranchCoverageRegEx));
73
+ function nodeShouldBeDeleted(path, updateStatementCoverageRegEx, shouldRemoveBranchCoverage, updateBranchCoverageRegEx, omitInstrumentedFunctionMap, updateFnMapCoverageCommand) {
74
+ return isStatementCoverageUpdateExpresion(path.node, updateStatementCoverageRegEx) || (shouldRemoveBranchCoverage && isBranchCoverageUpdateExpresion(path.node, updateBranchCoverageRegEx))
75
+ || (omitInstrumentedFunctionMap && isFunctionMapCoverageRelatedObject(path.node, updateFnMapCoverageCommand));
70
76
  }
71
77
  /**
72
78
  * Traverse over the ast and deletes statement (and branch) coverage update commands (cov_1234.s[1]++)
@@ -75,10 +81,11 @@ function nodeShouldBeDeleted(path, updateStatementCoverageRegEx, shouldRemoveBra
75
81
  * @param updateStatementCoverageRegEx
76
82
  * @param updateBranchCoverageRegEx
77
83
  */
78
- function removeRedundantUpdateCommands(ast, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx) {
84
+ // TODO: Remove omitInstrumentedFunctionMap addition from this method, unnecessary step
85
+ function removeRedundantUpdateCommands(ast, shouldRemoveBranchCoverage, updateStatementCoverageRegEx, updateBranchCoverageRegEx, omitInstrumentedFunctionMap, updateFnMapCoverageCommand) {
79
86
  astTypes.visit(ast, {
80
87
  visitUpdateExpression(path) {
81
- if (nodeShouldBeDeleted(path, updateStatementCoverageRegEx, shouldRemoveBranchCoverage, updateBranchCoverageRegEx)) {
88
+ if (nodeShouldBeDeleted(path, updateStatementCoverageRegEx, shouldRemoveBranchCoverage, updateBranchCoverageRegEx, omitInstrumentedFunctionMap, updateFnMapCoverageCommand)) {
82
89
  path.prune();
83
90
  }
84
91
  this.traverse(path);
@@ -93,10 +100,10 @@ function removeRedundantUpdateCommands(ast, shouldRemoveBranchCoverage, updateSt
93
100
  * @param ast
94
101
  * @param shouldRemoveBranchCoverage
95
102
  */
96
- function reduceCoverageObjectSize(ast, shouldRemoveBranchCoverage) {
103
+ function reduceCoverageObjectSize(ast, shouldRemoveBranchCoverage, omitInstrumentedFunctionMap) {
97
104
  astTypes.visit(ast, {
98
105
  visitObjectProperty(path) {
99
- if (shouldConvertToEmptyObject(path, shouldRemoveBranchCoverage)) {
106
+ if (shouldConvertToEmptyObject(path, shouldRemoveBranchCoverage, omitInstrumentedFunctionMap)) {
100
107
  path.value.value.properties = [];
101
108
  }
102
109
  else if (shouldUseShortPropNames(path.value, shouldRemoveBranchCoverage)) {
@@ -153,6 +160,9 @@ function createAST(instrumentedCode, babylonPlugins) {
153
160
  function isStatementCoverageRelatedObject(node) {
154
161
  return node && node.key && (node.key.name === "statementMap" || node.key.name === "s") && node.value;
155
162
  }
163
+ function isFunctionMapCoverageRelatedObject(node) {
164
+ return node && node.key && (node.key.name === "fnMap") && node.value;
165
+ }
156
166
  function isBranchCoverageRelatedObject(node) {
157
167
  return node && node.key && (node.key.name === "branchMap" || node.key.name === "b") && node.value;
158
168
  }
@@ -1 +1 @@
1
- {"version":3,"file":"instrumented-file-size-reducer.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/instrumented-file-size-reducer.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instrumented-file-size-reducer.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/instrumented-file-size-reducer.js"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { ContentInstrumenter } from '../content-instrumenter';
4
4
  export interface IInstrumentationStrategyParams {
5
5
  shouldMinifyInstrumentedOutput: boolean;
6
6
  shouldReduceInstrumentedFileSize: boolean;
7
+ omitInstrumentedFunctionMap: boolean;
7
8
  useBranchCoverage: boolean;
8
9
  babylonPlugins: boolean;
9
10
  experimentalSizeReduction: boolean;
@@ -40,7 +40,7 @@ class JsFileInstrumentationStrategy {
40
40
  }
41
41
  postInstrumentation(instrumentedContent, fileKey) {
42
42
  if (this.config.shouldReduceInstrumentedFileSize) {
43
- instrumentedContent = this.reduceFileSize(instrumentedContent, fileKey);
43
+ instrumentedContent = this.reduceFileSize(instrumentedContent, fileKey, this.config.omitInstrumentedFunctionMap);
44
44
  }
45
45
  instrumentedContent = this.addPreamble(instrumentedContent);
46
46
  return instrumentedContent;
@@ -61,8 +61,8 @@ class JsFileInstrumentationStrategy {
61
61
  // Concatenate the preamble and instrumentedContent, prepending any "use strict" if found
62
62
  return [contentToPrepend, ...this.preamble, instrumentedContent].filter(Boolean).join('\n');
63
63
  }
64
- reduceFileSize(instrumentedCode, fileKey) {
65
- return (0, instrumented_file_size_reducer_1.reduceContentSize)(fileKey, instrumentedCode, this.config.babylonPlugins, !this.config.useBranchCoverage, this.config.shouldMinifyInstrumentedOutput, this.logger, this.cockpitNotifier, this.config.experimentalSizeReduction);
64
+ reduceFileSize(instrumentedCode, fileKey, omitInstrumentedFunctionMap) {
65
+ return (0, instrumented_file_size_reducer_1.reduceContentSize)(fileKey, instrumentedCode, this.config.babylonPlugins, !this.config.useBranchCoverage, this.config.shouldMinifyInstrumentedOutput, this.logger, this.cockpitNotifier, this.config.experimentalSizeReduction, omitInstrumentedFunctionMap);
66
66
  }
67
67
  }
68
68
  exports.JsFileInstrumentationStrategy = JsFileInstrumentationStrategy;
@@ -1 +1 @@
1
- {"version":3,"file":"js-instrumnetation-strategy.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/strategies/js-instrumnetation-strategy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"js-instrumnetation-strategy.js","sourceRoot":"","sources":["../../../../build-scanner/instrumentation/strategies/js-instrumnetation-strategy.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.BaseExecutor = void 0;
13
13
  const contracts_1 = require("../contracts");
14
14
  const token_data_builder_1 = require("../../common/utils/token-data-builder");
15
- const backend_proxy_1 = require("../../common/http/backend-proxy");
16
15
  const build_session_data_builder_1 = require("../../common/utils/build-session-data-builder");
17
16
  const agent_instance_data_1 = require("../agent-instance-data");
18
17
  const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
@@ -21,6 +20,8 @@ const logger_1 = require("../../common/logger");
21
20
  const config_loader_1 = require("../../common/config-process/config-loader");
22
21
  const v8_utils_1 = require("../../common/v8-utils");
23
22
  const http_client_1 = require("../../common/http/http-client");
23
+ const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
24
+ const backend_proxy_1 = require("../../common/http/backend-proxy");
24
25
  /**
25
26
  * Base class for executing all CLI commands.
26
27
  * Verify that buildSessionId and token params are correct.
@@ -68,12 +69,12 @@ class BaseExecutor {
68
69
  throw new Error('Invalid token. Skipping sealights integration. See log for more details');
69
70
  }
70
71
  const httpConfig = Object.assign(Object.assign({}, tokenData), { proxy: args.proxy });
71
- const backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, httpConfig, this.logger);
72
- const buildSessionData = yield this.getBuildSessionData(backendProxy, args);
72
+ this.backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, httpConfig, this.logger);
73
+ const buildSessionData = yield this.getBuildSessionData(args);
73
74
  if (!buildSessionData) {
74
75
  throw new Error('Invalid build session data. Skipping sealights integration. See log for more details');
75
76
  }
76
- backendProxy.updateMetadata({
77
+ this.backendProxy.updateMetadata({
77
78
  buildSessionId: buildSessionData.buildSessionId
78
79
  });
79
80
  this._baseData = Object.assign(Object.assign(Object.assign({}, tokenData), buildSessionData), { proxy: args.proxy, labid: args.labid });
@@ -102,9 +103,9 @@ class BaseExecutor {
102
103
  get baseData() {
103
104
  return this._baseData;
104
105
  }
105
- getBuildSessionData(backendProxy, cmd) {
106
+ getBuildSessionData(cmd) {
106
107
  return __awaiter(this, void 0, void 0, function* () {
107
- const buildSessionDataBuilder = new build_session_data_builder_1.BuildSessionDataBuilder(backendProxy);
108
+ const buildSessionDataBuilder = new build_session_data_builder_1.BuildSessionDataBuilder(this.backendProxy);
108
109
  return yield buildSessionDataBuilder.build(cmd);
109
110
  });
110
111
  }
@@ -119,7 +120,7 @@ class BaseExecutor {
119
120
  agentInstanceData.AgentAllocatedMemoryInMb = yield v8_utils_1.V8Utils.heapSizeLimitMB();
120
121
  const agentConfig = this.createAgentConfig(cmdArgs);
121
122
  try {
122
- yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agentInstanceData, this.logger);
123
+ yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agentInstanceData, this.logger, this.backendProxy);
123
124
  }
124
125
  catch (e) {
125
126
  this.logger.error(`Failed to submit agent start event, Error: '${e}'`);
@@ -167,7 +168,7 @@ class BaseExecutor {
167
168
  getRemoteConfigFromServer(agentBaseData) {
168
169
  return __awaiter(this, void 0, void 0, function* () {
169
170
  try {
170
- const backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, agentBaseData, this.logger);
171
+ const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, agentBaseData, this.logger);
171
172
  const remoteConfig = yield backendProxy.getRemoteConfigPromise(agentBaseData);
172
173
  this.agentRemoteConfig = remoteConfig || {};
173
174
  }
@@ -1 +1 @@
1
- {"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/base-executor.ts"],"names":[],"mappings":"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"}
@@ -12,10 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.BuildEndExecutor = void 0;
13
13
  const base_executor_1 = require("./base-executor");
14
14
  const contracts_1 = require("../contracts");
15
- const backend_proxy_1 = require("../../common/http/backend-proxy");
16
15
  const agent_instance_data_1 = require("../agent-instance-data");
17
16
  const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
18
17
  const utils_1 = require("../utils");
18
+ const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
19
19
  class BuildEndExecutor extends base_executor_1.BaseExecutor {
20
20
  constructor() {
21
21
  super(...arguments);
@@ -24,8 +24,8 @@ class BuildEndExecutor extends base_executor_1.BaseExecutor {
24
24
  innerExecute(args) {
25
25
  return __awaiter(this, void 0, void 0, function* () {
26
26
  const agentConfig = (0, utils_1.createAgentConfig)(this.baseData);
27
- const backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
28
- yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agent_instance_data_1.agentInstanceData, this.logger, {}, backendProxy);
27
+ const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
28
+ yield cockpit_notifier_1.CockpitNotifier.notifyStart(agentConfig, agent_instance_data_1.agentInstanceData, this.logger, backendProxy, {});
29
29
  try {
30
30
  yield backendProxy.buildEnd(this.mapArgs(args));
31
31
  return true;
@@ -1 +1 @@
1
- {"version":3,"file":"build-end-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-end-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,4CAAqD;AACrD,mEAA6D;AAC7D,gEAAyD;AACzD,iFAA2E;AAC3E,oCAA2C;AAG3C,MAAa,gBAAiB,SAAQ,4BAA0C;IAAhF;;QACc,gBAAW,GAAG,UAAU,CAAC;IAkDvC,CAAC;IAjDgB,YAAY,CAAC,IAAmB;;YACzC,MAAM,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACrF,MAAM,kCAAe,CAAC,WAAW,CAAC,WAAW,EAAE,uCAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,YAAY,CAAC,CAAA;YAChG,IAAI;gBACA,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC;aACf;oBAAU;gBACP,MAAM,kCAAe,CAAC,cAAc,EAAE,CAAC;aAC1C;QACL,CAAC;KAAA;IAEM,OAAO,CAAC,IAAmB;QAC9B,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAC9B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;YAChC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAC9B,MAAM,EAAG;gBACL,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;aACnC;SACJ,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,KAAe;QAClC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,mBAAmB,CAAC,IAAmB;;QAC3C,MAAM,WAAW,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAG,CAAC,CAAC,CAAC;QAEpC,IAAG,WAAW,KAAK,oBAAQ,CAAC,SAAS,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,mFAAmF,CAAC,CAAC;SAC9G;IACL,CAAC;IAED,YAAY,CAAC,IAAmB;QAC5B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,2CAA2C,CAAC,CAAC;YACnE,OAAO,KAAK,CAAC;SAChB;QAED,IAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,0DAA0D,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAnDD,4CAmDC"}
1
+ {"version":3,"file":"build-end-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/build-end-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,4CAAqD;AACrD,gEAAyD;AACzD,iFAA2E;AAC3E,oCAA2C;AAE3C,2GAA0F;AAE1F,MAAa,gBAAiB,SAAQ,4BAA0C;IAAhF;;QACc,gBAAW,GAAG,UAAU,CAAC;IAkDvC,CAAC;IAjDgB,YAAY,CAAC,IAAmB;;YACzC,MAAM,WAAW,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9G,MAAM,kCAAe,CAAC,WAAW,CAAC,WAAW,EAAE,uCAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,CAAA;YAChG,IAAI;gBACA,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC;aACf;oBAAU;gBACP,MAAM,kCAAe,CAAC,cAAc,EAAE,CAAC;aAC1C;QACL,CAAC;KAAA;IAEM,OAAO,CAAC,IAAmB;QAC9B,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;YAC9B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;YAChC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAC9B,MAAM,EAAG;gBACL,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;aACnC;SACJ,CAAC;IACN,CAAC;IAEM,eAAe,CAAC,KAAe;QAClC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,mBAAmB,CAAC,IAAmB;;QAC3C,MAAM,WAAW,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAG,CAAC,CAAC,CAAC;QAEpC,IAAG,WAAW,KAAK,oBAAQ,CAAC,SAAS,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,mFAAmF,CAAC,CAAC;SAC9G;IACL,CAAC;IAED,YAAY,CAAC,IAAmB;QAC5B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,2CAA2C,CAAC,CAAC;YACnE,OAAO,KAAK,CAAC;SAChB;QAED,IAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,0DAA0D,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAnDD,4CAmDC"}
@@ -11,10 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.ConfigExecutor = void 0;
13
13
  const base_executor_1 = require("./base-executor");
14
- const backend_proxy_1 = require("../../common/http/backend-proxy");
15
14
  const build_session_data_builder_1 = require("../../common/utils/build-session-data-builder");
16
15
  const agent_instance_data_1 = require("../agent-instance-data");
17
16
  const fs_1 = require("fs");
17
+ const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
18
18
  class ConfigExecutor extends base_executor_1.BaseExecutor {
19
19
  constructor() {
20
20
  super(...arguments);
@@ -23,7 +23,7 @@ class ConfigExecutor extends base_executor_1.BaseExecutor {
23
23
  innerExecute(args) {
24
24
  return __awaiter(this, void 0, void 0, function* () {
25
25
  const data = this.mapArgs(args);
26
- const backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
26
+ const backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
27
27
  try {
28
28
  const buildSessionId = yield backendProxy.createBuildSessionIdPromise(data);
29
29
  const buildSessionIdFile = this.getPath(args);
@@ -40,9 +40,9 @@ class ConfigExecutor extends base_executor_1.BaseExecutor {
40
40
  getPath(args) {
41
41
  return args.buildsessionidfile || 'buildSessionId';
42
42
  }
43
- getBuildSessionData(backendProxy, cmd) {
43
+ getBuildSessionData(cmd) {
44
44
  return __awaiter(this, void 0, void 0, function* () {
45
- return new build_session_data_builder_1.BuildSessionDataBuilder(backendProxy).parseFromCli(cmd);
45
+ return new build_session_data_builder_1.BuildSessionDataBuilder(this.backendProxy).parseFromCli(cmd);
46
46
  });
47
47
  }
48
48
  mapArgs(args) {
@@ -1 +1 @@
1
- {"version":3,"file":"config-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/config-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,mEAA6D;AAC7D,8FAAsF;AACtF,gEAAyD;AACzD,2BAAiC;AAIjC,MAAa,cAAe,SAAQ,4BAA2C;IAA/E;;QAEc,gBAAW,GAAG,QAAQ,CAAC;IAkCrC,CAAC;IAhCgB,YAAY,CAAC,IAAiB;;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACrF,IAAI;gBACA,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;gBAC5E,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC9C,IAAA,kBAAa,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;gBAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,cAAc,qBAAqB,kBAAkB,EAAE,CAAC,CAAC;gBAC3G,OAAO,IAAI,CAAC;aACf;YAAA,OAAO,CAAC,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,EAAE,CAAC,CAAC;gBAChF,OAAO,KAAK,CAAC;aAChB;QACL,CAAC;KAAA;IAEO,OAAO,CAAC,IAAiB;QAC7B,OAAO,IAAI,CAAC,kBAAkB,IAAI,gBAAgB,CAAC;IACvD,CAAC;IAEe,mBAAmB,CAAC,YAA0B,EAAE,GAAgB;;YAC5E,OAAO,IAAI,oDAAuB,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACvE,CAAC;KAAA;IAEM,OAAO,CAAC,IAAiB;QAC5B,MAAM,IAAI,GAAqB;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,SAAS,EAAE,IAAI,CAAC,KAAK;YACrB,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAA;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AApCD,wCAoCC"}
1
+ {"version":3,"file":"config-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/config-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAA6C;AAC7C,8FAAsF;AACtF,gEAAyD;AACzD,2BAAiC;AAGjC,2GAA0F;AAE1F,MAAa,cAAe,SAAQ,4BAA2C;IAA/E;;QAEc,gBAAW,GAAG,QAAQ,CAAC;IAkCrC,CAAC;IAhCgB,YAAY,CAAC,IAAiB;;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,YAAY,GAAG,uDAAmB,CAAC,qBAAqB,CAAC,uCAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9G,IAAI;gBACA,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;gBAC5E,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC9C,IAAA,kBAAa,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;gBAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,cAAc,qBAAqB,kBAAkB,EAAE,CAAC,CAAC;gBAC3G,OAAO,IAAI,CAAC;aACf;YAAA,OAAO,CAAC,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,EAAE,CAAC,CAAC;gBAChF,OAAO,KAAK,CAAC;aAChB;QACL,CAAC;KAAA;IAEO,OAAO,CAAC,IAAiB;QAC7B,OAAO,IAAI,CAAC,kBAAkB,IAAI,gBAAgB,CAAC;IACvD,CAAC;IAEe,mBAAmB,CAAC,GAAgB;;YAChD,OAAO,IAAI,oDAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;KAAA;IAEM,OAAO,CAAC,IAAiB;QAC5B,MAAM,IAAI,GAAqB;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,SAAS,EAAE,IAAI,CAAC,KAAK;YACrB,cAAc,EAAE,IAAI,CAAC,cAAc;SACtC,CAAA;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AApCD,wCAoCC"}
@@ -13,12 +13,12 @@ exports.IntegrationBuildComponentsExecutor = void 0;
13
13
  const base_executor_1 = require("./base-executor");
14
14
  const dependency_utils_1 = require("../../common/utils/dependency-utils");
15
15
  const fs_1 = require("fs");
16
- const backend_proxy_1 = require("../../common/http/backend-proxy");
17
16
  const agent_instance_data_1 = require("../agent-instance-data");
17
+ const backend_proxy_with_default_client_1 = require("../../common/http/backend-proxy-with-default-client");
18
18
  class IntegrationBuildComponentsExecutor extends base_executor_1.BaseExecutor {
19
19
  innerExecute(args, extraArgs) {
20
20
  return __awaiter(this, void 0, void 0, function* () {
21
- this.backendProxy = new backend_proxy_1.BackendProxy(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
21
+ this.backendProxy = backend_proxy_with_default_client_1.BackendProxyFactory.initWithDefaultClient(agent_instance_data_1.agentInstanceData, this.baseData, this.logger);
22
22
  const components = this.getIntegrationBuildDependenciesFromArgs(args);
23
23
  if (components.length > 0) {
24
24
  yield this.submitRequest(this.baseData.buildSessionId, components, agent_instance_data_1.agentInstanceData.agentId);