@forge/cli 11.6.0 → 12.0.0-experimental-3d5c74d

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 (102) hide show
  1. package/CHANGELOG.md +278 -0
  2. package/npm-shrinkwrap.json +1297 -1278
  3. package/out/analytics-client/analytics-client.d.ts +2 -3
  4. package/out/analytics-client/analytics-client.d.ts.map +1 -1
  5. package/out/analytics-client/analytics-client.js +2 -9
  6. package/out/analytics-client/analytics-client.js.map +1 -1
  7. package/out/bin/postinstall.js +1 -1
  8. package/out/bin/postinstall.js.map +1 -1
  9. package/out/command-line/command.d.ts +0 -1
  10. package/out/command-line/command.d.ts.map +1 -1
  11. package/out/command-line/command.js +0 -3
  12. package/out/command-line/command.js.map +1 -1
  13. package/out/command-line/controller/build-controller.d.ts +1 -3
  14. package/out/command-line/controller/build-controller.d.ts.map +1 -1
  15. package/out/command-line/controller/build-controller.js +2 -10
  16. package/out/command-line/controller/build-controller.js.map +1 -1
  17. package/out/command-line/controller/deploy-controller.d.ts +1 -2
  18. package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
  19. package/out/command-line/controller/deploy-controller.js +2 -7
  20. package/out/command-line/controller/deploy-controller.js.map +1 -1
  21. package/out/command-line/controller/install-controller.d.ts +2 -1
  22. package/out/command-line/controller/install-controller.d.ts.map +1 -1
  23. package/out/command-line/controller/install-controller.js +18 -12
  24. package/out/command-line/controller/install-controller.js.map +1 -1
  25. package/out/command-line/controller/pre-command-controller.d.ts +0 -1
  26. package/out/command-line/controller/pre-command-controller.d.ts.map +1 -1
  27. package/out/command-line/controller/pre-command-controller.js +1 -17
  28. package/out/command-line/controller/pre-command-controller.js.map +1 -1
  29. package/out/command-line/controller/tunnel-controller.d.ts +3 -8
  30. package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
  31. package/out/command-line/controller/tunnel-controller.js +6 -36
  32. package/out/command-line/controller/tunnel-controller.js.map +1 -1
  33. package/out/command-line/dependency-injection.d.ts +1 -2
  34. package/out/command-line/dependency-injection.d.ts.map +1 -1
  35. package/out/command-line/dependency-injection.js +15 -23
  36. package/out/command-line/dependency-injection.js.map +1 -1
  37. package/out/command-line/register-app-commands.d.ts +1 -0
  38. package/out/command-line/register-app-commands.d.ts.map +1 -1
  39. package/out/command-line/register-app-commands.js +6 -2
  40. package/out/command-line/register-app-commands.js.map +1 -1
  41. package/out/command-line/register-containers-commands.d.ts.map +1 -1
  42. package/out/command-line/register-containers-commands.js +9 -19
  43. package/out/command-line/register-containers-commands.js.map +1 -1
  44. package/out/command-line/register-lint-command.d.ts.map +1 -1
  45. package/out/command-line/register-lint-command.js +0 -1
  46. package/out/command-line/register-lint-command.js.map +1 -1
  47. package/out/command-line/register-log-commands.d.ts.map +1 -1
  48. package/out/command-line/register-log-commands.js +2 -1
  49. package/out/command-line/register-log-commands.js.map +1 -1
  50. package/out/command-line/register-version-commands.js +2 -2
  51. package/out/command-line/register-version-commands.js.map +1 -1
  52. package/out/command-line/version-info.js +1 -1
  53. package/out/command-line/version-info.js.map +1 -1
  54. package/out/command-line/view/lite-lint-view.d.ts +0 -1
  55. package/out/command-line/view/lite-lint-view.d.ts.map +1 -1
  56. package/out/command-line/view/lite-lint-view.js +0 -6
  57. package/out/command-line/view/lite-lint-view.js.map +1 -1
  58. package/out/command-line/view/tunnel-view.d.ts +2 -16
  59. package/out/command-line/view/tunnel-view.d.ts.map +1 -1
  60. package/out/command-line/view/tunnel-view.js +2 -90
  61. package/out/command-line/view/tunnel-view.js.map +1 -1
  62. package/out/containers/container-command.d.ts.map +1 -1
  63. package/out/containers/container-command.js +0 -11
  64. package/out/containers/container-command.js.map +1 -1
  65. package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
  66. package/out/deploy/deployer/deploy-monitor-graphql-client.js +0 -4
  67. package/out/deploy/deployer/deploy-monitor-graphql-client.js.map +1 -1
  68. package/out/deploy/deployer/deployer.d.ts +0 -5
  69. package/out/deploy/deployer/deployer.d.ts.map +1 -1
  70. package/out/deploy/deployer/deployer.js +1 -33
  71. package/out/deploy/deployer/deployer.js.map +1 -1
  72. package/out/deploy/packager/archiver.d.ts +1 -0
  73. package/out/deploy/packager/archiver.d.ts.map +1 -1
  74. package/out/deploy/packager/runtime-bundler.d.ts +0 -6
  75. package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
  76. package/out/deploy/packager/runtime-bundler.js +5 -21
  77. package/out/deploy/packager/runtime-bundler.js.map +1 -1
  78. package/out/service/docker-service.d.ts +0 -4
  79. package/out/service/docker-service.d.ts.map +1 -1
  80. package/out/service/docker-service.js +0 -26
  81. package/out/service/docker-service.js.map +1 -1
  82. package/out/service/lint-service.d.ts +4 -3
  83. package/out/service/lint-service.d.ts.map +1 -1
  84. package/out/service/lint-service.js +4 -2
  85. package/out/service/lint-service.js.map +1 -1
  86. package/out/service/lite-lint-service.d.ts +3 -2
  87. package/out/service/lite-lint-service.d.ts.map +1 -1
  88. package/out/service/lite-lint-service.js +2 -2
  89. package/out/service/lite-lint-service.js.map +1 -1
  90. package/out/service/tunnel-analytics-service.d.ts +0 -4
  91. package/out/service/tunnel-analytics-service.d.ts.map +1 -1
  92. package/out/service/tunnel-analytics-service.js +0 -15
  93. package/out/service/tunnel-analytics-service.js.map +1 -1
  94. package/out/service/tunnel-service.d.ts +1 -36
  95. package/out/service/tunnel-service.d.ts.map +1 -1
  96. package/out/service/tunnel-service.js +1 -197
  97. package/out/service/tunnel-service.js.map +1 -1
  98. package/package.json +11 -10
  99. package/out/workers/tunnel-clean-up-worker.d.ts +0 -8
  100. package/out/workers/tunnel-clean-up-worker.d.ts.map +0 -1
  101. package/out/workers/tunnel-clean-up-worker.js +0 -32
  102. package/out/workers/tunnel-clean-up-worker.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAUpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAKtD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAOtD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAexD,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAW1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}
1
+ {"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAQpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAOtD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBrE,OAAO,CAAC,WAAW;CAWpB"}
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.DockerService = exports.DockerErrorCode = exports.DOCKER_DOWNLOAD_LINK = exports.DockerError = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const child_process_1 = require("child_process");
6
- const path_1 = tslib_1.__importDefault(require("path"));
7
6
  const command_exists_1 = tslib_1.__importDefault(require("command-exists"));
8
7
  const cross_spawn_1 = require("cross-spawn");
9
8
  const cli_shared_1 = require("@forge/cli-shared");
@@ -27,10 +26,6 @@ class DockerService {
27
26
  throw new DockerError(cli_shared_1.Text.tunnel.error.dockerNotInstalled(exports.DOCKER_DOWNLOAD_LINK), DockerErrorCode.NOT_INSTALLED);
28
27
  }
29
28
  }
30
- runContainer(args) {
31
- this.verifyInstalled();
32
- return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: ['inherit', 'inherit', 'pipe'] });
33
- }
34
29
  authenticateDocker(args) {
35
30
  this.verifyInstalled();
36
31
  return (0, cross_spawn_1.spawn)('docker', ['login', ...args], {
@@ -46,27 +41,6 @@ class DockerService {
46
41
  const dockerVersion = stdout.trim();
47
42
  return dockerVersion;
48
43
  }
49
- async removeContainer(containerName) {
50
- this.verifyInstalled();
51
- await this.execPromise(`docker rm -f ${containerName}`);
52
- }
53
- downloadImage(imageName) {
54
- this.verifyInstalled();
55
- return (0, cross_spawn_1.spawn)('docker', ['pull', imageName], {
56
- env: {
57
- ...process.env,
58
- DOCKER_CLI_HINTS: '0'
59
- }
60
- });
61
- }
62
- startCleanupWorker(pids, containerName) {
63
- const dockerCleanUp = (0, cross_spawn_1.spawn)(process.env.NODE_ENV === 'development' ? 'ts-node' : 'node', [path_1.default.join(__dirname, '../workers/tunnel-cleanup-worker')], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
64
- const message = {
65
- pids,
66
- containers: [containerName]
67
- };
68
- dockerCleanUp.send(message);
69
- }
70
44
  execPromise(cmd) {
71
45
  return new Promise((resolve) => {
72
46
  (0, child_process_1.exec)(cmd, (err, stdout, stderr) => {
@@ -1 +1 @@
1
- {"version":3,"file":"docker-service.js","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":";;;;AAAA,iDAAoD;AACpD,wDAAwB;AAExB,4EAA2C;AAC3C,6CAAoC;AAEpC,kDAAoD;AAUpD,MAAa,WAAY,SAAQ,sBAAS;IAGtB;IAFlB,YACE,OAAe,EACC,IAAqB;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,SAAI,GAAJ,IAAI,CAAiB;IAGvC,CAAC;CACF;AAPD,kCAOC;AAEY,QAAA,oBAAoB,GAAG,qCAAqC,CAAC;AAE1E,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,iFAAkB,CAAA;IAClB,uEAAa,CAAA;AACf,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED,MAAa,aAAa;IACjB,eAAe;QACpB,IAAI,CAAC,wBAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,4BAAoB,CAAC,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;SAClH;IACH,CAAC;IAEM,YAAY,CAAC,IAAc;QAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;IAEM,kBAAkB,CAAC,IAAc;QACtC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;YACzC,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;SACtC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,YAAqB;QACjD,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,+CAA+C,CAAC,CAAC;QAEhG,IAAI,GAAG,EAAE;YACP,MAAM,IAAI,WAAW,CACnB,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,EACnE,eAAe,CAAC,kBAAkB,CACnC,CAAC;SACH;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpC,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,aAAqB;QAChD,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,aAAa,EAAE,CAAC,CAAC;IAC1D,CAAC;IAEM,aAAa,CAAC,SAAiB;QACpC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;YAC1C,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBAEd,gBAAgB,EAAE,GAAG;aACtB;SACF,CAAC,CAAC;IACL,CAAC;IAEM,kBAAkB,CAAC,IAAc,EAAE,aAAqB;QAC7D,MAAM,aAAa,GAAG,IAAA,mBAAK,EACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAC3D,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,EAC1D,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,CACjD,CAAC;QACF,MAAM,OAAO,GAAyB;YACpC,IAAI;YACJ,UAAU,EAAE,CAAC,aAAa,CAAC;SAC5B,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAGO,WAAW,CAAC,GAAW;QAC7B,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,EAAE;YAChD,IAAA,oBAAI,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAChC,OAAO,CAAC;oBACN,GAAG,EAAE,GAAG;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA3ED,sCA2EC"}
1
+ {"version":3,"file":"docker-service.js","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":";;;;AAAA,iDAAoD;AAEpD,4EAA2C;AAC3C,6CAAoC;AAEpC,kDAAoD;AAQpD,MAAa,WAAY,SAAQ,sBAAS;IAGtB;IAFlB,YACE,OAAe,EACC,IAAqB;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,SAAI,GAAJ,IAAI,CAAiB;IAGvC,CAAC;CACF;AAPD,kCAOC;AAEY,QAAA,oBAAoB,GAAG,qCAAqC,CAAC;AAE1E,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,iFAAkB,CAAA;IAClB,uEAAa,CAAA;AACf,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED,MAAa,aAAa;IACjB,eAAe;QACpB,IAAI,CAAC,wBAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,4BAAoB,CAAC,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;SAClH;IACH,CAAC;IAEM,kBAAkB,CAAC,IAAc;QACtC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;YACzC,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;SACtC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,YAAqB;QACjD,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,+CAA+C,CAAC,CAAC;QAEhG,IAAI,GAAG,EAAE;YACP,MAAM,IAAI,WAAW,CACnB,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,EACnE,eAAe,CAAC,kBAAkB,CACnC,CAAC;SACH;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpC,OAAO,aAAa,CAAC;IACvB,CAAC;IAGO,WAAW,CAAC,GAAW;QAC7B,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,EAAE;YAChD,IAAA,oBAAI,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAChC,OAAO,CAAC;oBACN,GAAG,EAAE,GAAG;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzCD,sCAyCC"}
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" />
2
- import { ConfigFile, FileSystemReader } from '@forge/cli-shared';
2
+ import { ConfigFile, FileSystemReader, StatsigService } from '@forge/cli-shared';
3
3
  import { LintFixState, LintResult, LintLogger, ProblemCount } from '@forge/lint';
4
4
  interface LintOptions {
5
5
  fix?: boolean;
@@ -12,8 +12,9 @@ export declare const DEFAULT_DIRECTORY = "./src";
12
12
  export declare class LintService {
13
13
  private readonly configFile;
14
14
  private readonly fileSystemReader;
15
- constructor(configFile: ConfigFile, fileSystemReader: FileSystemReader);
16
- run(environment: string, { fix }: LintOptions, logger: LintLogger, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, logger: LintLogger, parseFunction?: ((filepath: string, parser: (code: string, filepath: string, parseOptions?: Partial<import("@forge/lint").ParseOptions> | undefined) => Promise<import("@forge/lint").ASTParseResult>, readFilePromise?: typeof import("fs").readFile.__promisify__ | undefined) => Promise<import("@forge/lint").LintInput>) | undefined, linters?: import("@forge/lint").LinterInterface[] | undefined) => Promise<LintResult[]>): Promise<RunResult>;
15
+ private readonly statsigService;
16
+ constructor(configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService);
17
+ run(environment: string, { fix }: LintOptions, logger: LintLogger, directory?: string, lintFunction?: (filesToLint: string[], manifest: import("@forge/manifest").ManifestSchema, environment: string, logger: LintLogger, statsigService: StatsigService, parseFunction?: ((filepath: string, parser: (code: string, filepath: string, parseOptions?: Partial<import("@forge/lint").ParseOptions> | undefined) => Promise<import("@forge/lint").ASTParseResult>, readFilePromise?: typeof import("fs").readFile.__promisify__ | undefined) => Promise<import("@forge/lint").LintInput>) | undefined, linters?: import("@forge/lint").LinterInterface[] | undefined) => Promise<LintResult[]>): Promise<RunResult>;
17
18
  private fix;
18
19
  problemCount(lintResults: LintResult[]): ProblemCount;
19
20
  private failedScopesFromLintResult;
@@ -1 +1 @@
1
- {"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,UAAU,EACV,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBADhB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB;IAGxC,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,0hBAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YA2BP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}
1
+ {"version":3,"file":"lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAsB,gBAAgB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACrG,OAAO,EAEL,YAAY,EACZ,UAAU,EAGV,UAAU,EACV,YAAY,EACb,MAAM,aAAa,CAAC;AAGrB,UAAU,WAAW;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,UAAU,SAAS;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAFd,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc;IAGpC,GAAG,CACd,WAAW,EAAE,MAAM,EACnB,EAAE,GAAG,EAAE,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,EAClB,SAAS,SAAoB,EAC7B,YAAY,0jBAAO,GAClB,OAAO,CAAC,SAAS,CAAC;YAiCP,GAAG;IASV,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,YAAY;IAI5D,OAAO,CAAC,0BAA0B;IAI3B,YAAY,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE;CAOzD"}
@@ -9,9 +9,11 @@ exports.DEFAULT_DIRECTORY = './src';
9
9
  class LintService {
10
10
  configFile;
11
11
  fileSystemReader;
12
- constructor(configFile, fileSystemReader) {
12
+ statsigService;
13
+ constructor(configFile, fileSystemReader, statsigService) {
13
14
  this.configFile = configFile;
14
15
  this.fileSystemReader = fileSystemReader;
16
+ this.statsigService = statsigService;
15
17
  }
16
18
  async run(environment, { fix }, logger, directory = exports.DEFAULT_DIRECTORY, lintFunction = lint_1.lint) {
17
19
  const csuikResources = await this.configFile.getResources(['nativeUI']);
@@ -25,7 +27,7 @@ class LintService {
25
27
  const allFilesToLint = filesToLint
26
28
  .concat(csuikFilesToLint)
27
29
  .filter((value, index, arr) => arr.indexOf(value) === index);
28
- const lintResults = await lintFunction(allFilesToLint, await this.configFile.readConfig(), environment, logger);
30
+ const lintResults = await lintFunction(allFilesToLint, await this.configFile.readConfig(), environment, logger, this.statsigService);
29
31
  if (fix) {
30
32
  return { lintResults, fixResults: await this.fix(lintResults) };
31
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"lint-service.js","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lint-service.js","sourceRoot":"","sources":["../../src/service/lint-service.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import { LintLogger, LintResult } from '@forge/lint';
2
+ import { StatsigService } from '@forge/cli-shared';
2
3
  export declare class LiteLintService {
3
4
  private readonly lintService;
4
5
  private readonly problemCounter;
5
- constructor(lintService?: (logger: LintLogger, linter?: import("@forge/lint").LinterInterface | undefined) => Promise<LintResult[]>, problemCounter?: (lintResults: LintResult[]) => import("@forge/lint").ProblemCount);
6
- run(checkSchema: boolean, logger: LintLogger): Promise<LintResult[]>;
6
+ constructor(lintService?: (logger: LintLogger, statsigService: StatsigService, linter?: import("@forge/lint").LinterInterface | undefined) => Promise<LintResult[]>, problemCounter?: (lintResults: LintResult[]) => import("@forge/lint").ProblemCount);
7
+ run(checkSchema: boolean, logger: LintLogger, statsigService: StatsigService): Promise<LintResult[]>;
7
8
  private filterResults;
8
9
  hasErrors(report: LintResult[]): boolean;
9
10
  }
@@ -1 +1 @@
1
- {"version":3,"file":"lite-lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAG7E,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBADd,WAAW,4GAAW,EACtB,cAAc,oEAAe;IAGnC,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAKjF,OAAO,CAAC,aAAa;IASd,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO;CAGhD"}
1
+ {"version":3,"file":"lite-lint-service.d.ts","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAgB,UAAU,EAAE,MAAM,aAAa,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBADd,WAAW,4IAAW,EACtB,cAAc,oEAAe;IAGnC,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAKjH,OAAO,CAAC,aAAa;IASd,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO;CAGhD"}
@@ -10,8 +10,8 @@ class LiteLintService {
10
10
  this.lintService = lintService;
11
11
  this.problemCounter = problemCounter;
12
12
  }
13
- async run(checkSchema, logger) {
14
- const report = await this.lintService(logger);
13
+ async run(checkSchema, logger, statsigService) {
14
+ const report = await this.lintService(logger, statsigService);
15
15
  return this.filterResults(report, checkSchema);
16
16
  }
17
17
  filterResults(report, checkSchema) {
@@ -1 +1 @@
1
- {"version":3,"file":"lite-lint-service.js","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":";;;AAAA,sCAA6E;AAC7E,8CAA6C;AAE7C,MAAa,eAAe;IAEP;IACA;IAFnB,YACmB,cAAc,eAAQ,EACtB,iBAAiB,mBAAY;QAD7B,gBAAW,GAAX,WAAW,CAAW;QACtB,mBAAc,GAAd,cAAc,CAAe;IAC7C,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,WAAoB,EAAE,MAAkB;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;IAEO,aAAa,CAAC,MAAoB,EAAE,WAAoB;QAC9D,OAAO,WAAW;YAChB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACf,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,qBAAU,CAAC,WAAW,CAAC,CAAC;gBAC1E,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;IACT,CAAC;IAEM,SAAS,CAAC,MAAoB;QACnC,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAChD,CAAC;CACF;AAvBD,0CAuBC"}
1
+ {"version":3,"file":"lite-lint-service.js","sourceRoot":"","sources":["../../src/service/lite-lint-service.ts"],"names":[],"mappings":";;;AAAA,sCAA6E;AAC7E,8CAA6C;AAG7C,MAAa,eAAe;IAEP;IACA;IAFnB,YACmB,cAAc,eAAQ,EACtB,iBAAiB,mBAAY;QAD7B,gBAAW,GAAX,WAAW,CAAW;QACtB,mBAAc,GAAd,cAAc,CAAe;IAC7C,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,WAAoB,EAAE,MAAkB,EAAE,cAA8B;QACvF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;IAEO,aAAa,CAAC,MAAoB,EAAE,WAAoB;QAC9D,OAAO,WAAW;YAChB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACf,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,qBAAU,CAAC,WAAW,CAAC,CAAC;gBAC1E,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;IACT,CAAC;IAEM,SAAS,CAAC,MAAoB;QACnC,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAChD,CAAC;CACF;AAvBD,0CAuBC"}
@@ -1,15 +1,11 @@
1
1
  import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
2
2
  import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
3
- import { DownloadProgressCallbacks } from '../command-line/view/tunnel-view';
4
3
  export declare class TunnelAnalyticsService {
5
4
  private readonly analyticsClientReporter;
6
5
  private readonly cliDetails;
7
6
  constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
8
- reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
9
- reportTunnelClosed(creds: PersonalApiCredentialsValidated): void;
10
7
  reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
11
8
  [key: string]: any;
12
9
  }): Promise<void>;
13
- getImageDownloadReporters(creds: PersonalApiCredentialsValidated): DownloadProgressCallbacks;
14
10
  }
15
11
  //# sourceMappingURL=tunnel-analytics-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAG9C,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAI1D,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAiB7B,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}
1
+ {"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;CAgBrC"}
@@ -9,14 +9,6 @@ class TunnelAnalyticsService {
9
9
  this.analyticsClientReporter = analyticsClientReporter;
10
10
  this.cliDetails = cliDetails;
11
11
  }
12
- reportDockerVersion(creds, dockerVersion) {
13
- this.analyticsClientReporter.reportSuccess('docker version check', creds, {
14
- dockerVersion
15
- });
16
- }
17
- reportTunnelClosed(creds) {
18
- this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
19
- }
20
12
  async reportTunnelFailure(creds, errorName, attributes) {
21
13
  attributes = {
22
14
  error: errorName,
@@ -31,13 +23,6 @@ class TunnelAnalyticsService {
31
23
  }
32
24
  this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
33
25
  }
34
- getImageDownloadReporters(creds) {
35
- return {
36
- onStart: () => this.analyticsClientReporter.reportSuccess('image download started', creds, {}),
37
- onFailure: () => this.analyticsClientReporter.reportSuccess('image download failed', creds, {}),
38
- onSuccess: () => this.analyticsClientReporter.reportSuccess('image download finished', creds, {})
39
- };
40
- }
41
26
  }
42
27
  exports.TunnelAnalyticsService = TunnelAnalyticsService;
43
28
  //# sourceMappingURL=tunnel-analytics-service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AAIpG,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,mBAAmB,CAAC,KAAsC,EAAE,aAA4B;QAC7F,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,sBAAsB,EAAE,KAAK,EAAE;YACxE,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAEM,kBAAkB,CAAC,KAAsC;QAC9D,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,KAAsC,EACtC,SAAiB,EACjB,UAAkC;QAElC,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;IAEM,yBAAyB,CAAC,KAAsC;QACrE,OAAO;YACL,OAAO,EAAE,GAAS,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,wBAAwB,EAAE,KAAK,EAAE,EAAE,CAAC;YACpG,SAAS,EAAE,GAAS,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,uBAAuB,EAAE,KAAK,EAAE,EAAE,CAAC;YACrG,SAAS,EAAE,GAAS,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,yBAAyB,EAAE,KAAK,EAAE,EAAE,CAAC;SACxG,CAAC;IACJ,CAAC;CACF;AA3CD,wDA2CC"}
1
+ {"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AAGpG,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAC9B,KAAsC,EACtC,SAAiB,EACjB,UAAkC;QAElC,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;CACF;AAzBD,wDAyBC"}
@@ -1,12 +1,8 @@
1
- import { spawn } from 'cross-spawn';
2
- import { PersonalApiCredentials, PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
1
+ import { PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
3
2
  import { StartTunnelCommand, TunnelInteractor } from '@forge/tunnel';
4
3
  import { CachedConfigService } from './cached-config-service';
5
- import { DockerService } from './docker-service';
6
4
  import { ConfigFilePortFindingService } from './port-finding-service';
7
5
  import { TunnelAnalyticsService } from './tunnel-analytics-service';
8
- export declare const CONTAINER_NAME: string;
9
- export declare const IMAGE_NAME: string;
10
6
  export declare type TunnelService = {
11
7
  run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
12
8
  };
@@ -33,36 +29,5 @@ export declare class InProcessTunnelService extends TunnelServiceBase {
33
29
  constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService);
34
30
  run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
35
31
  }
36
- interface EnvironmentVariable {
37
- key: string;
38
- value: string;
39
- }
40
- declare abstract class SandboxTunnelServiceBase extends TunnelServiceBase {
41
- protected readonly configFilePortFindingService: ConfigFilePortFindingService;
42
- protected readonly cachedConfigService: CachedConfigService;
43
- constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService);
44
- getTunnelProcessEnvironment(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials, port: number, cspReporterPort: number | undefined, resourcePorts: Record<string, number>): Promise<EnvironmentVariable[]>;
45
- private getInspectorPortEnvironment;
46
- private getCspReporterPortEnvironment;
47
- private getResourcePortEnvironment;
48
- private getUserEnvironmentVariables;
49
- }
50
- export declare class LocalTunnelService extends SandboxTunnelServiceBase {
51
- run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
52
- private formatEnvForLocalTunnel;
53
- }
54
- export declare class DockerTunnelService extends SandboxTunnelServiceBase {
55
- private readonly dockerService;
56
- private readonly analyticsService;
57
- constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
58
- run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
59
- bootstrapDocker(): Promise<ReturnType<typeof spawn> | undefined>;
60
- private validateDockerVersion;
61
- private getDockerPortOptions;
62
- private formatEnvForDocker;
63
- private getInteractiveOptions;
64
- private getVolumeOptions;
65
- private getCommonOptions;
66
- }
67
32
  export {};
68
33
  //# sourceMappingURL=tunnel-service.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,+BAA+B,EAE/B,aAAa,EACb,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CACD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,uBAAe,iBAAkB,YAAW,aAAa;IAC3C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;gBAAxC,mBAAmB,EAAE,mBAAmB;aAEvD,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CACjB;AAaD,qBAAa,sBAAuB,SAAQ,iBAAiB;IAEzD,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBALhB,EAAE,EAAE,EAAE,EACN,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B,EAC3E,mBAAmB,EAAE,mBAAmB,EACvB,gBAAgB,EAAE,sBAAsB;IAK9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CAsBjB"}
@@ -1,33 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.DockerTunnelService = exports.LocalTunnelService = exports.InProcessTunnelService = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = exports.IMAGE_NAME = exports.CONTAINER_NAME = void 0;
4
- const tslib_1 = require("tslib");
5
- const cross_spawn_1 = require("cross-spawn");
6
- const os_1 = tslib_1.__importDefault(require("os"));
7
- const path_1 = require("path");
8
- const portfinder_1 = require("portfinder");
9
- const semver_1 = require("semver");
3
+ exports.InProcessTunnelService = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
10
4
  const manifest_1 = require("@forge/manifest");
11
5
  const cli_shared_1 = require("@forge/cli-shared");
12
- const version_info_1 = require("../command-line/version-info");
13
- const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
14
- exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
15
- const cliDetails = (0, version_info_1.getCLIDetails)();
16
- let versionTags;
17
- if (cliDetails?.version !== undefined) {
18
- if (process.env.FORGE_IN_LOCAL_E2E === 'true') {
19
- versionTags = ['e2e'];
20
- }
21
- else {
22
- versionTags = (0, semver_1.prerelease)(cliDetails.version) || ['latest'];
23
- }
24
- }
25
- else {
26
- versionTags = ['latest'];
27
- }
28
- exports.IMAGE_NAME = process.env.FORGE_DEV_DOCKER_TUNNEL
29
- ? 'local/forge-tunnel:test'
30
- : `atlassian/forge-tunnel:${versionTags[0]}`;
31
6
  class FunctionHandlersMustBeDefinedInDebugMode extends cli_shared_1.UserError {
32
7
  constructor() {
33
8
  super(cli_shared_1.Text.tunnel.functionHandlersMustBeDefined);
@@ -90,175 +65,4 @@ class InProcessTunnelService extends TunnelServiceBase {
90
65
  }
91
66
  }
92
67
  exports.InProcessTunnelService = InProcessTunnelService;
93
- class SandboxTunnelServiceBase extends TunnelServiceBase {
94
- configFilePortFindingService;
95
- cachedConfigService;
96
- constructor(configFilePortFindingService, cachedConfigService) {
97
- super(cachedConfigService);
98
- this.configFilePortFindingService = configFilePortFindingService;
99
- this.cachedConfigService = cachedConfigService;
100
- }
101
- async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
102
- const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
103
- return [
104
- { key: 'APP_FOLDER', value: '/app' },
105
- { key: 'FORGE_EMAIL', value: email },
106
- { key: 'FORGE_API_TOKEN', value: token },
107
- { key: 'ENVIRONMENT_KEY', value: tunnelOptions.environment ?? 'default' },
108
- { key: 'TUNNEL_INSPECTOR_ENABLED', value: (!!tunnelOptions.debug).toString() },
109
- { key: 'FORGE_GRAPHQL_GATEWAY', value: graphqlGateway },
110
- { key: 'VERBOSE_MODE', value: `${debugEnabled}` },
111
- { key: 'CLI_DETAILS', value: JSON.stringify(cliDetails) },
112
- ...this.getInspectorPortEnvironment(port),
113
- ...this.getCspReporterPortEnvironment(cspReporterPort),
114
- ...this.getResourcePortEnvironment(resourcePorts),
115
- ...this.getUserEnvironmentVariables()
116
- ];
117
- }
118
- getInspectorPortEnvironment(port) {
119
- return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
120
- }
121
- getCspReporterPortEnvironment(cspReporterPort) {
122
- if (cspReporterPort) {
123
- return [{ key: 'CSP_REPORTER_PORT', value: cspReporterPort.toString() }];
124
- }
125
- return [];
126
- }
127
- getResourcePortEnvironment(resourcePorts) {
128
- return [{ key: `RESOURCE_PORT_MAP`, value: JSON.stringify(resourcePorts) }];
129
- }
130
- getUserEnvironmentVariables() {
131
- const vars = [];
132
- Object.keys(process.env)
133
- .filter((variable) => variable.startsWith('FORGE_USER_VAR_'))
134
- .forEach((name) => {
135
- vars.push({ key: name, value: process.env[name] ?? 'undefined' });
136
- });
137
- return vars;
138
- }
139
- }
140
- class LocalTunnelService extends SandboxTunnelServiceBase {
141
- async run(tunnelOptions, creds, debugEnabled, onError) {
142
- const port = await (0, portfinder_1.getPortPromise)();
143
- const resourcePorts = await this.configFilePortFindingService.findPorts();
144
- const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
145
- const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
146
- const env = this.formatEnvForLocalTunnel(environment);
147
- const process = (0, cross_spawn_1.spawn)('forge-tunnel', [], {
148
- stdio: 'inherit',
149
- env: {
150
- ...env,
151
- FORGE_DEV_TUNNEL: 'true'
152
- }
153
- });
154
- if (onError) {
155
- process.on('error', onError);
156
- }
157
- }
158
- formatEnvForLocalTunnel(environment) {
159
- return Object.assign({}, {
160
- PATH: process.env.PATH || '',
161
- FORCE_COLOR: '1'
162
- }, ...environment.map(({ key, value }) => ({ [key]: value })));
163
- }
164
- }
165
- exports.LocalTunnelService = LocalTunnelService;
166
- class DockerTunnelService extends SandboxTunnelServiceBase {
167
- dockerService;
168
- analyticsService;
169
- constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService) {
170
- super(configFilePortFindingService, cachedConfigService);
171
- this.dockerService = dockerService;
172
- this.analyticsService = analyticsService;
173
- }
174
- async run(tunnelOptions, creds, debugEnabled) {
175
- await this.validateDockerVersion(creds, debugEnabled);
176
- const startPort = 8000 + Math.round(Math.random() * 100);
177
- const port = await (0, portfinder_1.getPortPromise)({ port: startPort });
178
- const dockerOptions = await this.getCommonOptions();
179
- const resourcePorts = await this.configFilePortFindingService.findPorts(port);
180
- const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
181
- const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
182
- const portOptions = this.getDockerPortOptions(port, resourcePorts, cspReporterPort);
183
- const interactiveOptions = this.getInteractiveOptions();
184
- const volumeOptions = await this.getVolumeOptions();
185
- const env = this.formatEnvForDocker(environment);
186
- const docker = this.dockerService.runContainer([
187
- ...interactiveOptions,
188
- ...volumeOptions,
189
- ...portOptions,
190
- ...dockerOptions,
191
- ...env,
192
- exports.IMAGE_NAME
193
- ]);
194
- docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
195
- docker.stderr?.on('data', async (error) => {
196
- const errorMessage = error;
197
- let errorJson;
198
- try {
199
- errorJson = JSON.parse(errorMessage);
200
- }
201
- catch (e) {
202
- }
203
- if (errorJson && errorJson.__tunnel_error__) {
204
- const tunnelErrorDetails = errorJson;
205
- await this.analyticsService.reportTunnelFailure(creds, tunnelErrorDetails.name, tunnelErrorDetails.attributes);
206
- }
207
- else {
208
- process.stderr?.write(errorMessage);
209
- }
210
- });
211
- this.dockerService.startCleanupWorker([docker.pid], exports.CONTAINER_NAME);
212
- }
213
- async bootstrapDocker() {
214
- await this.dockerService.removeContainer(exports.CONTAINER_NAME);
215
- if (!process.env.FORGE_DEV_DOCKER_TUNNEL) {
216
- return this.dockerService.downloadImage(exports.IMAGE_NAME);
217
- }
218
- }
219
- async validateDockerVersion(creds, debugEnabled) {
220
- const version = await this.dockerService.getDockerVersion(debugEnabled);
221
- this.analyticsService.reportDockerVersion(creds, version);
222
- }
223
- getDockerPortOptions(port, resourcePorts, cspReporterPort) {
224
- const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
225
- '-p',
226
- `${resourcePort}:${resourcePort}`
227
- ]);
228
- const cspReporterPortOption = [];
229
- if (cspReporterPort) {
230
- cspReporterPortOption.push('-p', `${cspReporterPort}:${cspReporterPort}`);
231
- }
232
- const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
233
- return [`-p`, `${port}:${port}`, ...resourcePortOptions, ...addHostOption, ...cspReporterPortOption];
234
- }
235
- formatEnvForDocker(environment) {
236
- return (0, cli_shared_1.flatMap)(environment, ({ key, value }) => ['--env', `${key}=${value}`]);
237
- }
238
- getInteractiveOptions() {
239
- if (DISABLE_TTY) {
240
- return [`-i`];
241
- }
242
- return [`-it`];
243
- }
244
- async getVolumeOptions() {
245
- const options = [`-v=${process.cwd()}:/app:cached`];
246
- if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
247
- const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
248
- options.push(`-v=${monorepoRoot}:/monorepo:cached`);
249
- options.push(`-v=${monorepoRoot}/node_modules/cloudflared/docker-bin:/monorepo/node_modules/cloudflared/bin`);
250
- }
251
- if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
252
- const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
253
- mounts.forEach((mount) => {
254
- options.push(`-v=${mount}:cached`);
255
- });
256
- }
257
- return options;
258
- }
259
- async getCommonOptions() {
260
- return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
261
- }
262
- }
263
- exports.DockerTunnelService = DockerTunnelService;
264
68
  //# sourceMappingURL=tunnel-service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;;AAAA,6CAAoC;AACpC,oDAAoB;AACpB,+BAAwC;AACxC,2CAA4C;AAC5C,mCAAoC;AACpC,8CAAgD;AAEhD,kDAY2B;AAG3B,+DAA6D;AAM7D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;AAE1C,QAAA,cAAc,GAAG,uBAAuB,OAAO,CAAC,GAAG,EAAE,CAAC;AAEnE,MAAM,UAAU,GAAG,IAAA,4BAAa,GAAE,CAAC;AACnC,IAAI,WAAqD,CAAC;AAC1D,IAAI,UAAU,EAAE,OAAO,KAAK,SAAS,EAAE;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;QAC7C,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC;KACvB;SAAM;QACL,WAAW,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KAC5D;CACF;KAAM;IACL,WAAW,GAAG,CAAC,QAAQ,CAAC,CAAC;CAC1B;AAEY,QAAA,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB;IAC3D,CAAC,CAAC,yBAAyB;IAC3B,CAAC,CAAC,0BAA0B,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;AAW/C,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAe,iBAAiB;IACC;IAA/B,YAA+B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;CAQ5E;AAaD,MAAa,sBAAuB,SAAQ,iBAAiB;IAExC;IACA;IACA;IACA;IAEA;IANnB,YACmB,EAAM,EACN,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D,EAC3E,mBAAwC,EACvB,gBAAwC;QAEzD,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAPV,OAAE,GAAF,EAAE,CAAI;QACN,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAE1D,qBAAgB,GAAhB,gBAAgB,CAAwB;IAG3D,CAAC;IAEM,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB,EACrB,OAAuC;QAEvC,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;YAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACnD,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;gBACrF,eAAe;gBACf,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,OAAO,EAAE;gBACX,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;aAClB;iBAAM;gBACL,MAAM,IAAA,wBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAC/B;SACF;IACH,CAAC;CACF;AAvCD,wDAuCC;AAOD,MAAe,wBAAyB,SAAQ,iBAAiB;IAE1C;IACA;IAFrB,YACqB,4BAA0D,EAC1D,mBAAwC;QAE3D,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAHR,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,wBAAmB,GAAnB,mBAAmB,CAAqB;IAG7D,CAAC;IAEM,KAAK,CAAC,2BAA2B,CACtC,aAA4B,EAC5B,YAAqB,EACrB,EAAE,KAAK,EAAE,KAAK,EAA0B,EACxC,IAAY,EACZ,eAAmC,EACnC,aAAqC;QAErC,MAAM,cAAc,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAE3C,OAAO;YACL,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE;YACpC,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE;YACpC,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,EAAE;YACxC,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,aAAa,CAAC,WAAW,IAAI,SAAS,EAAE;YACzE,EAAE,GAAG,EAAE,0BAA0B,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9E,EAAE,GAAG,EAAE,uBAAuB,EAAE,KAAK,EAAE,cAAc,EAAE;YACvD,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,EAAE;YACjD,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;YACzD,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;YACzC,GAAG,IAAI,CAAC,6BAA6B,CAAC,eAAe,CAAC;YACtD,GAAG,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC;YACjD,GAAG,IAAI,CAAC,2BAA2B,EAAE;SACtC,CAAC;IACJ,CAAC;IAEO,2BAA2B,CAAC,IAAY;QAC9C,OAAO,CAAC,EAAE,GAAG,EAAE,uBAAuB,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC;IAEO,6BAA6B,CAAC,eAAmC;QACvE,IAAI,eAAe,EAAE;YACnB,OAAO,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC1E;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,0BAA0B,CAAC,aAAqC;QACtE,OAAO,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IAEO,2BAA2B;QACjC,MAAM,IAAI,GAA0B,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACrB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;aAC5D,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAa,kBAAmB,SAAQ,wBAAwB;IACvD,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB,EACrB,OAAuC;QAEvC,MAAM,IAAI,GAAG,MAAM,IAAA,2BAAc,GAAE,CAAC;QACpC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAC1E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAE5G,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,2BAA2B,CACxD,aAAa,EACb,YAAY,EACZ,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,CACd,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAG,IAAA,mBAAK,EAAC,cAAc,EAAE,EAAE,EAAE;YACxC,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE;gBACH,GAAG,GAAG;gBACN,gBAAgB,EAAE,MAAM;aACzB;SACF,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAC9B;IACH,CAAC;IAEO,uBAAuB,CAAC,WAAkC;QAChE,OAAO,MAAM,CAAC,MAAM,CAClB,EAAE,EACF;YACE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE;YAC5B,WAAW,EAAE,GAAG;SACjB,EACD,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAC3D,CAAC;IACJ,CAAC;CACF;AA3CD,gDA2CC;AAED,MAAa,mBAAoB,SAAQ,wBAAwB;IAI5C;IACA;IAJnB,YACE,4BAA0D,EAC1D,mBAAwC,EACvB,aAA4B,EAC5B,gBAAwC;QAEzD,KAAK,CAAC,4BAA4B,EAAE,mBAAmB,CAAC,CAAC;QAHxC,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAwB;IAG3D,CAAC;IAEM,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB;QAErB,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QAOtD,MAAM,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,MAAM,IAAA,2BAAc,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAEvD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5G,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,2BAA2B,CACxD,aAAa,EACb,YAAY,EACZ,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,CACd,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;QACpF,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACxD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpD,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEjD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;YAC7C,GAAG,kBAAkB;YACrB,GAAG,aAAa;YAChB,GAAG,WAAW;YACd,GAAG,aAAa;YAChB,GAAG,GAAG;YACN,kBAAU;SACX,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACxC,MAAM,YAAY,GAAG,KAAK,CAAC;YAE3B,IAAI,SAAS,CAAC;YACd,IAAI;gBACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;aACtC;YAAC,OAAO,CAAC,EAAE;aAEX;YAED,IAAI,SAAS,IAAI,SAAS,CAAC,gBAAgB,EAAE;gBAC3C,MAAM,kBAAkB,GAAG,SAA+B,CAAC;gBAC3D,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;aAChH;iBAAM;gBAEL,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;aACrC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,sBAAc,CAAC,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,sBAAc,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;YACxC,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAU,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,KAAsC,EAAE,YAAqB;QAC/F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAExE,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAEO,oBAAoB,CAC1B,IAAY,EACZ,aAAqC,EACrC,eAAmC;QAEnC,MAAM,mBAAmB,GAAG,IAAA,oBAAO,EAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC;YAClF,IAAI;YACJ,GAAG,YAAY,IAAI,YAAY,EAAE;SAClC,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAa,EAAE,CAAC;QAC3C,IAAI,eAAe,EAAE;YACnB,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;SAC3E;QAGD,MAAM,aAAa,GAAG,YAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,mCAAmC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE3G,OAAO,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE,EAAE,GAAG,mBAAmB,EAAE,GAAG,aAAa,EAAE,GAAG,qBAAqB,CAAC,CAAC;IACvG,CAAC;IAEO,kBAAkB,CAAC,WAAkC;QAC3D,OAAO,IAAA,oBAAO,EAAC,WAAW,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC;IAChF,CAAC;IAEO,qBAAqB;QAE3B,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,CAAC;SACf;QACD,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,OAAO,GAAa,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QAC9D,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;YACvC,MAAM,YAAY,GAAG,IAAA,WAAQ,EAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YACxD,OAAO,CAAC,IAAI,CAAC,MAAM,YAAY,mBAAmB,CAAC,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,MAAM,YAAY,6EAA6E,CAAC,CAAC;SAC/G;QAID,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE;YAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,sBAAc,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IACzE,CAAC;CACF;AA/ID,kDA+IC"}
1
+ {"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAQ2B;AAgB3B,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAe,iBAAiB;IACC;IAA/B,YAA+B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;CAQ5E;AAaD,MAAa,sBAAuB,SAAQ,iBAAiB;IAExC;IACA;IACA;IACA;IAEA;IANnB,YACmB,EAAM,EACN,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D,EAC3E,mBAAwC,EACvB,gBAAwC;QAEzD,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAPV,OAAE,GAAF,EAAE,CAAI;QACN,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAE1D,qBAAgB,GAAhB,gBAAgB,CAAwB;IAG3D,CAAC;IAEM,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB,EACrB,OAAuC;QAEvC,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;YAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACnD,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;gBACrF,eAAe;gBACf,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,OAAO,EAAE;gBACX,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;aAClB;iBAAM;gBACL,MAAM,IAAA,wBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAC/B;SACF;IACH,CAAC;CACF;AAvCD,wDAuCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "11.6.0",
3
+ "version": "12.0.0-experimental-3d5c74d",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -18,13 +18,13 @@
18
18
  "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
19
19
  },
20
20
  "dependencies": {
21
- "@forge/bundler": "5.0.0",
22
- "@forge/cli-shared": "7.0.0",
23
- "@forge/egress": "1.4.1",
24
- "@forge/lint": "5.8.1",
25
- "@forge/manifest": "9.4.0",
26
- "@forge/runtime": "5.10.8",
27
- "@forge/tunnel": "5.11.0",
21
+ "@forge/bundler": "6.0.0",
22
+ "@forge/cli-shared": "8.0.0",
23
+ "@forge/egress": "2.0.0",
24
+ "@forge/lint": "5.9.0",
25
+ "@forge/manifest": "10.0.0",
26
+ "@forge/runtime": "6.0.0",
27
+ "@forge/tunnel": "6.0.0",
28
28
  "@forge/util": "1.4.9",
29
29
  "@sentry/node": "7.106.0",
30
30
  "@forge/i18n": "0.0.6",
@@ -70,13 +70,14 @@
70
70
  "@types/hidefile": "^3.0.3",
71
71
  "@types/inquirer": "^8.2.10",
72
72
  "@types/jest": "^29.5.12",
73
- "@types/node": "14.18.63",
73
+ "@types/node": "20.19.0",
74
74
  "@types/node-fetch": "^2.6.11",
75
75
  "@types/omelette": "^0.4.4",
76
76
  "@types/semver": "^7.5.8",
77
77
  "@types/tmp": "^0.2.6",
78
78
  "@types/uuid": "^9.0.8",
79
79
  "@types/jws": "^3.2.10",
80
+ "chokidar": "^3.6.0",
80
81
  "jws": "^4.0.0",
81
82
  "jest": "^29.7.0",
82
83
  "jest-fixtures": "^0.6.0",
@@ -87,7 +88,7 @@
87
88
  "type-fest": "4.10.2"
88
89
  },
89
90
  "engines": {
90
- "node": ">=18.20.7"
91
+ "node": ">=20.0.0"
91
92
  },
92
93
  "publishConfig": {
93
94
  "registry": "https://packages.atlassian.com/api/npm/npm-public/"
@@ -1,8 +0,0 @@
1
- export declare type TunnelCleanUpMessage = {
2
- pids: number[];
3
- containers: string[];
4
- };
5
- export declare class TunnelCleanUpWorker {
6
- doWork(): void;
7
- }
8
- //# sourceMappingURL=tunnel-clean-up-worker.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tunnel-clean-up-worker.d.ts","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":"AAGA,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,qBAAa,mBAAmB;IACvB,MAAM,IAAI,IAAI;CAwBtB"}