@forge/cli 12.0.0-next.7 → 12.0.0

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 (57) hide show
  1. package/CHANGELOG.md +163 -0
  2. package/npm-shrinkwrap.json +1298 -1279
  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/controller/tunnel-controller.d.ts +3 -7
  10. package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
  11. package/out/command-line/controller/tunnel-controller.js +2 -22
  12. package/out/command-line/controller/tunnel-controller.js.map +1 -1
  13. package/out/command-line/dependency-injection.d.ts +1 -1
  14. package/out/command-line/dependency-injection.d.ts.map +1 -1
  15. package/out/command-line/dependency-injection.js +10 -12
  16. package/out/command-line/dependency-injection.js.map +1 -1
  17. package/out/command-line/register-log-commands.d.ts.map +1 -1
  18. package/out/command-line/register-log-commands.js +2 -1
  19. package/out/command-line/register-log-commands.js.map +1 -1
  20. package/out/command-line/register-version-commands.js +2 -2
  21. package/out/command-line/register-version-commands.js.map +1 -1
  22. package/out/command-line/version-info.js +1 -1
  23. package/out/command-line/version-info.js.map +1 -1
  24. package/out/command-line/view/tunnel-view.d.ts +2 -16
  25. package/out/command-line/view/tunnel-view.d.ts.map +1 -1
  26. package/out/command-line/view/tunnel-view.js +2 -90
  27. package/out/command-line/view/tunnel-view.js.map +1 -1
  28. package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
  29. package/out/deploy/deployer/deploy-monitor-graphql-client.js +0 -4
  30. package/out/deploy/deployer/deploy-monitor-graphql-client.js.map +1 -1
  31. package/out/deploy/deployer/deployer.d.ts +0 -5
  32. package/out/deploy/deployer/deployer.d.ts.map +1 -1
  33. package/out/deploy/deployer/deployer.js +1 -33
  34. package/out/deploy/deployer/deployer.js.map +1 -1
  35. package/out/deploy/packager/archiver.d.ts +1 -0
  36. package/out/deploy/packager/archiver.d.ts.map +1 -1
  37. package/out/deploy/packager/runtime-bundler.d.ts +0 -3
  38. package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
  39. package/out/deploy/packager/runtime-bundler.js +5 -12
  40. package/out/deploy/packager/runtime-bundler.js.map +1 -1
  41. package/out/service/docker-service.d.ts +0 -4
  42. package/out/service/docker-service.d.ts.map +1 -1
  43. package/out/service/docker-service.js +0 -26
  44. package/out/service/docker-service.js.map +1 -1
  45. package/out/service/tunnel-analytics-service.d.ts +0 -4
  46. package/out/service/tunnel-analytics-service.d.ts.map +1 -1
  47. package/out/service/tunnel-analytics-service.js +0 -15
  48. package/out/service/tunnel-analytics-service.js.map +1 -1
  49. package/out/service/tunnel-service.d.ts +1 -36
  50. package/out/service/tunnel-service.d.ts.map +1 -1
  51. package/out/service/tunnel-service.js +1 -197
  52. package/out/service/tunnel-service.js.map +1 -1
  53. package/package.json +11 -10
  54. package/out/workers/tunnel-clean-up-worker.d.ts +0 -8
  55. package/out/workers/tunnel-clean-up-worker.d.ts.map +0 -1
  56. package/out/workers/tunnel-clean-up-worker.js +0 -32
  57. package/out/workers/tunnel-clean-up-worker.js.map +0 -1
package/out/analytics-client/analytics-client.d.ts CHANGED
@@ -1,13 +1,12 @@
1
- import { PersonalApiCredentialsValidated, Logger } from '@forge/cli-shared';
1
+ import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
2
2
  import { Storage } from '../storage/local-file-storage';
3
3
  import { CachedConfigService } from '../service/cached-config-service';
4
4
  import { DeferredErrors } from '../command-line/errors';
5
5
  export declare type AttributeMapper<T> = (val: T) => T | undefined;
6
6
  export declare class AnalyticsClientReporter {
7
7
  private readonly storage;
8
- private readonly logger;
9
8
  private readonly configService;
10
- constructor(storage: Storage, logger: Logger, configService: CachedConfigService);
9
+ constructor(storage: Storage, configService: CachedConfigService);
11
10
  private readonly source;
12
11
  reportSuccess(cmdName: string, cred: PersonalApiCredentialsValidated | string, attributes: {
13
12
  [key: string]: any;
package/out/analytics-client/analytics-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,oBAAY,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AAW3D,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,mBAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAEvC,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,+BAA+B,GAAG,MAAM,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAsBA,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,EAAE,KAAK,GACP,IAAI;IAQA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAIA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,CAAC,EAAE,KAAK,GAAG,cAAc,GACzB,IAAI;IAQP,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;WAOP,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;CAS9C"}
1
+ {"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,oBAAY,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AAW3D,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADb,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,mBAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAEvC,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,+BAA+B,GAAG,MAAM,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAsBA,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,EAAE,KAAK,GACP,IAAI;IAQA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAIA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,CAAC,EAAE,KAAK,GAAG,cAAc,GACzB,IAAI;IAQP,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,qBAAqB;IAO7B,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;WAOP,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;CAS9C"}
package/out/analytics-client/analytics-client.js CHANGED
@@ -22,11 +22,9 @@ function appAidOrUndefined(appAri) {
22
22
  }
23
23
  class AnalyticsClientReporter {
24
24
  storage;
25
- logger;
26
25
  configService;
27
- constructor(storage, logger, configService) {
26
+ constructor(storage, configService) {
28
27
  this.storage = storage;
29
- this.logger = logger;
30
28
  this.configService = configService;
31
29
  }
32
30
  source = 'forge/cli';
@@ -94,12 +92,7 @@ class AnalyticsClientReporter {
94
92
  if (this.configService.getAnalyticsPreferences() === false) {
95
93
  return;
96
94
  }
97
- if (process.env.FORGE_DEV_DOCKER_TUNNEL || process.env.FORGE_DEV_TUNNEL) {
98
- this.logger.trace(`\nAnalytics event: ${JSON.stringify(analyticsEvent, null, 2)}`);
99
- }
100
- else {
101
- this.storage.addAnalyticsEvent(analyticsEvent);
102
- }
95
+ this.storage.addAnalyticsEvent(analyticsEvent);
103
96
  }
104
97
  _getUserId(cred) {
105
98
  return typeof cred === 'string'
package/out/analytics-client/analytics-client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-client.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"analytics-client.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"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"}
package/out/bin/postinstall.js CHANGED
@@ -11,7 +11,7 @@ const cached_config_service_1 = require("../service/cached-config-service");
11
11
  const ui = new cli_shared_1.CommandLineUI(() => true);
12
12
  const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
13
13
  const configService = new cached_config_service_1.CachedConfigService(cachedConf);
14
- const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, configService);
14
+ const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), configService);
15
15
  const cliDetails = (0, version_info_1.getCLIDetails)();
16
16
  const attributes = { version: cliDetails?.version };
17
17
  const anonId = (0, anon_user_id_1.getAnonId)(true);
package/out/bin/postinstall.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"postinstall.js","sourceRoot":"","sources":["../../src/bin/postinstall.ts"],"names":[],"mappings":";;AAAA,2EAA+E;AAC/E,kDAAyF;AACzF,sEAAiE;AACjE,gEAA4D;AAC5D,+DAA6D;AAC7D,+DAAyD;AACzD,uEAAoE;AACpE,4EAAuE;AAEvE,MAAM,EAAE,GAAG,IAAI,0BAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAEzC,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC;AAC5D,MAAM,aAAa,GAAG,IAAI,2CAAmB,CAAC,UAAU,CAAC,CAAC;AAC1D,MAAM,uBAAuB,GAAG,IAAI,0CAAuB,CAAC,IAAI,qCAAgB,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;AACvG,MAAM,UAAU,GAAG,IAAA,4BAAa,GAAE,CAAC;AACnC,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpD,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,CAAC;AAC/B,uBAAuB,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AAEzE,IAAI,IAAA,mCAAgB,GAAE,EAAE;IACtB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;CACxC;AAED,IAAI,gCAAc,CAAC,SAAS,CAAC,CAAC"}
1
+ {"version":3,"file":"postinstall.js","sourceRoot":"","sources":["../../src/bin/postinstall.ts"],"names":[],"mappings":";;AAAA,2EAA+E;AAC/E,kDAAyF;AACzF,sEAAiE;AACjE,gEAA4D;AAC5D,+DAA6D;AAC7D,+DAAyD;AACzD,uEAAoE;AACpE,4EAAuE;AAEvE,MAAM,EAAE,GAAG,IAAI,0BAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAEzC,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,gCAAmB,CAAC,CAAC;AAC5D,MAAM,aAAa,GAAG,IAAI,2CAAmB,CAAC,UAAU,CAAC,CAAC;AAC1D,MAAM,uBAAuB,GAAG,IAAI,0CAAuB,CAAC,IAAI,qCAAgB,EAAE,EAAE,aAAa,CAAC,CAAC;AACnG,MAAM,UAAU,GAAG,IAAA,4BAAa,GAAE,CAAC;AACnC,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpD,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,CAAC;AAC/B,uBAAuB,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AAEzE,IAAI,IAAA,mCAAgB,GAAE,EAAE;IACtB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;CACxC;AAED,IAAI,gCAAc,CAAC,SAAS,CAAC,CAAC"}
package/out/command-line/controller/tunnel-controller.d.ts CHANGED
@@ -1,17 +1,13 @@
1
- import { CommandLineUI, ConfigFile, CredentialGetter, PersonalApiCredentialsValidated, TunnelCommandOptions, TunnelOptions } from '@forge/cli-shared';
2
- import { TunnelAnalyticsService } from '../../service/tunnel-analytics-service';
3
- import { DockerTunnelService, TunnelService } from '../../service/tunnel-service';
1
+ import { CommandLineUI, ConfigFile, CredentialGetter, TunnelCommandOptions } from '@forge/cli-shared';
2
+ import { TunnelService } from '../../service/tunnel-service';
4
3
  import { TunnelView } from '../view/tunnel-view';
5
4
  export declare class TunnelController {
6
- private readonly analyticsService;
7
5
  private readonly nodeTunnelService;
8
- private readonly dockerTunnelService;
9
6
  private readonly tunnelView;
10
7
  private readonly configFile;
11
8
  private readonly credentialStore;
12
- constructor(analyticsService: TunnelAnalyticsService, nodeTunnelService: TunnelService, dockerTunnelService: DockerTunnelService, tunnelView: TunnelView, configFile: ConfigFile, credentialStore: CredentialGetter);
9
+ constructor(nodeTunnelService: TunnelService, tunnelView: TunnelView, configFile: ConfigFile, credentialStore: CredentialGetter);
13
10
  run(tunnelOptions: TunnelCommandOptions, ui: CommandLineUI): Promise<void>;
14
11
  private validateTunnelCommandOptions;
15
- runDockerTunnel(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
16
12
  }
17
13
  //# sourceMappingURL=tunnel-controller.d.ts.map
package/out/command-line/controller/tunnel-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EACV,gBAAgB,EAChB,+BAA+B,EAC/B,oBAAoB,EACpB,aAAa,EAId,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAEL,mBAAmB,EAGnB,aAAa,EACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBALf,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,gBAAgB;IAGvC,GAAG,CAAC,aAAa,EAAE,oBAAoB,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAkBzE,4BAA4B;IAyB7B,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
1
+ {"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EAKrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAIL,aAAa,EACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAHf,iBAAiB,EAAE,aAAa,EAChC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,gBAAgB;IAGvC,GAAG,CAAC,aAAa,EAAE,oBAAoB,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;YAkBzE,4BAA4B;CAwB3C"}
package/out/command-line/controller/tunnel-controller.js CHANGED
@@ -2,19 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TunnelController = void 0;
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
- const docker_service_1 = require("../../service/docker-service");
6
5
  const tunnel_service_1 = require("../../service/tunnel-service");
7
6
  class TunnelController {
8
- analyticsService;
9
7
  nodeTunnelService;
10
- dockerTunnelService;
11
8
  tunnelView;
12
9
  configFile;
13
10
  credentialStore;
14
- constructor(analyticsService, nodeTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore) {
15
- this.analyticsService = analyticsService;
11
+ constructor(nodeTunnelService, tunnelView, configFile, credentialStore) {
16
12
  this.nodeTunnelService = nodeTunnelService;
17
- this.dockerTunnelService = dockerTunnelService;
18
13
  this.tunnelView = tunnelView;
19
14
  this.configFile = configFile;
20
15
  this.credentialStore = credentialStore;
@@ -22,7 +17,7 @@ class TunnelController {
22
17
  async run(tunnelOptions, ui) {
23
18
  const options = await this.validateTunnelCommandOptions(tunnelOptions);
24
19
  const creds = await this.credentialStore.getCredentials();
25
- this.tunnelView.dockerPreamble(tunnelOptions.environment);
20
+ this.tunnelView.preamble(tunnelOptions.environment);
26
21
  const { modules } = await this.configFile.readConfig();
27
22
  if (modules) {
28
23
  const uiKit1Modules = (0, cli_shared_1.findUIKit1Modules)(modules);
@@ -52,21 +47,6 @@ class TunnelController {
52
47
  }
53
48
  return options;
54
49
  }
55
- async runDockerTunnel(tunnelOptions, creds, debugEnabled) {
56
- try {
57
- const imageDownloadChildProcess = await this.dockerTunnelService.bootstrapDocker();
58
- if (imageDownloadChildProcess) {
59
- await this.tunnelView.reportDownloadProgress(imageDownloadChildProcess, this.analyticsService.getImageDownloadReporters(creds));
60
- }
61
- }
62
- catch (err) {
63
- if (err.code === docker_service_1.DockerErrorCode.NOT_INSTALLED) {
64
- this.analyticsService.reportDockerVersion(creds, null);
65
- throw err;
66
- }
67
- }
68
- await this.dockerTunnelService.run(tunnelOptions, creds, debugEnabled);
69
- }
70
50
  }
71
51
  exports.TunnelController = TunnelController;
72
52
  //# sourceMappingURL=tunnel-controller.js.map
package/out/command-line/controller/tunnel-controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":";;;AAAA,kDAU2B;AAE3B,iEAA+D;AAE/D,iEAMsC;AAGtC,MAAa,gBAAgB;IAER;IACA;IACA;IACA;IACA;IACA;IANnB,YACmB,gBAAwC,EACxC,iBAAgC,EAChC,mBAAwC,EACxC,UAAsB,EACtB,UAAsB,EACtB,eAAiC;QALjC,qBAAgB,GAAhB,gBAAgB,CAAwB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAe;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAkB;IACjD,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAAmC,EAAE,EAAiB;QACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QAEvE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;QAE1D,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACvD,IAAI,OAAO,EAAE;YACX,MAAM,aAAa,GAAG,IAAA,8BAAiB,EAAC,OAAO,CAAC,CAAC;YACjD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;aAChE;SACF;QAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,aAAmC;QAC5E,MAAM,OAAO,GAAkB,EAAE,GAAG,aAAa,EAAE,iBAAiB,EAAE,qCAAwB,EAAE,CAAC;QACjG,IAAI,aAAa,CAAC,KAAK,EAAE;YACvB,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE,MAAM,EAAE;gBAChD,MAAM,IAAI,yDAAwC,EAAE,CAAC;aACtD;YAID,MAAM,gBAAgB,GAAc,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC3E,KAAK,MAAM,eAAe,IAAI,aAAa,CAAC,qBAAqB,EAAE;gBACjE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,KAAK,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;oBAChG,MAAM,IAAI,0CAAyB,CAAC,eAAe,CAAC,CAAC;iBACtD;aACF;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE;gBAC3C,MAAM,IAAI,+CAA8B,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;aAC3E;YACD,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAClC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,eAAe,CAC1B,aAA4B,EAC5B,KAAsC,EACtC,YAAqB;QAErB,IAAI;YACF,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;YACnF,IAAI,yBAAyB,EAAE;gBAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAC1C,yBAAyB,EACzB,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,KAAK,CAAC,CACvD,CAAC;aACH;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,GAAG,CAAC,IAAI,KAAK,gCAAe,CAAC,aAAa,EAAE;gBAC9C,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBACvD,MAAM,GAAG,CAAC;aACX;SAEF;QAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;CACF;AA5ED,4CA4EC"}
1
+ {"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":";;;AAAA,kDAS2B;AAE3B,iEAKsC;AAGtC,MAAa,gBAAgB;IAER;IACA;IACA;IACA;IAJnB,YACmB,iBAAgC,EAChC,UAAsB,EACtB,UAAsB,EACtB,eAAiC;QAHjC,sBAAiB,GAAjB,iBAAiB,CAAe;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAkB;IACjD,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAAmC,EAAE,EAAiB;QACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,aAAa,CAAC,CAAC;QAEvE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;QAE1D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAEpD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACvD,IAAI,OAAO,EAAE;YACX,MAAM,aAAa,GAAG,IAAA,8BAAiB,EAAC,OAAO,CAAC,CAAC;YACjD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC;aAChE;SACF;QAED,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,aAAmC;QAC5E,MAAM,OAAO,GAAkB,EAAE,GAAG,aAAa,EAAE,iBAAiB,EAAE,qCAAwB,EAAE,CAAC;QACjG,IAAI,aAAa,CAAC,KAAK,EAAE;YACvB,IAAI,CAAC,aAAa,CAAC,qBAAqB,EAAE,MAAM,EAAE;gBAChD,MAAM,IAAI,yDAAwC,EAAE,CAAC;aACtD;YAID,MAAM,gBAAgB,GAAc,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC3E,KAAK,MAAM,eAAe,IAAI,aAAa,CAAC,qBAAqB,EAAE;gBACjE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,KAAK,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE;oBAChG,MAAM,IAAI,0CAAyB,CAAC,eAAe,CAAC,CAAC;iBACtD;aACF;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;YACvD,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE;gBAC3C,MAAM,IAAI,+CAA8B,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;aAC3E;YACD,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;SAClC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAlDD,4CAkDC"}
package/out/command-line/dependency-injection.d.ts CHANGED
@@ -48,7 +48,7 @@ export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Pr
48
48
  installAppSiteCommand: InstallAppSiteCommand;
49
49
  uninstallAppCommand: UninstallAppCommand;
50
50
  getAppOwnerQuery: GetAppOwnerQuery;
51
- nodePackageUploadDeployCommand: PackageUploadDeployCommand;
51
+ packageUploadDeployCommand: PackageUploadDeployCommand;
52
52
  setEnvironmentVariableCommand: SetEnvironmentVariableCommand;
53
53
  deleteEnvironmentVariableCommand: DeleteEnvironmentVariableCommand;
54
54
  listEnvironmentVariablesCommand: ListEnvironmentVariablesCommand;
package/out/command-line/dependency-injection.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAKhB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKhE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8YvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAKhB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKhE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgYvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
package/out/command-line/dependency-injection.js CHANGED
@@ -6,7 +6,6 @@ const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
6
6
  const bundler_1 = require("@forge/bundler");
7
7
  const cli_shared_1 = require("@forge/cli-shared");
8
8
  const tunnel_1 = require("@forge/tunnel");
9
- const runtime_1 = require("@forge/runtime");
10
9
  const tunnel_2 = require("@forge/tunnel");
11
10
  const analytics_client_1 = require("../analytics-client/analytics-client");
12
11
  const deploy_1 = require("../deploy");
@@ -83,7 +82,7 @@ const getDependencies = async (cliDetails) => {
83
82
  const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
84
83
  const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
85
84
  const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
86
- const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, cachedConfigService);
85
+ const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), cachedConfigService);
87
86
  const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
88
87
  const createGraphQLClient = (auth) => {
89
88
  const minimalGraphQLRunner = new cli_shared_1.MinimalGraphQLRunner(auth, graphqlGateway, cliDetails);
@@ -160,9 +159,9 @@ const getDependencies = async (cliDetails) => {
160
159
  const archiveUploader = new deploy_1.AppArchiveUploader(assertiveAppConfigReader, uploaderArtifactClient, fileUploader, ui, new resources_uploader_service_1.ResourcesUploaderService(fileReader));
161
160
  const deployer = new deploy_1.ArtifactDeployer(assertiveAppConfigReader, triggerDeployClient, deployMonitorClient, cli_shared_1.pause, ui);
162
161
  const nodeBundle = (0, bundler_1.getNodeBundler)(ui, (0, bundler_1.getWrapperProvider)({ fileSystemReader: fileReader, statsigService }), configFile);
163
- const nodeRuntimeBundler = new runtime_bundler_1.NodeRuntimeBundler(archiverFactory, ui, nodeBundle, fileReader, configFile);
162
+ const runtimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, nodeBundle, fileReader, configFile);
164
163
  const nativeUiBundler = new bundler_1.NativeUIBundler(ui);
165
- const nodeAppPackager = new deploy_1.AppPackager(nodeRuntimeBundler, nativeUiBundler, ui);
164
+ const appPackager = new deploy_1.AppPackager(runtimeBundler, nativeUiBundler, ui);
166
165
  const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, webTriggerGraphqlClient);
167
166
  const autocompleteController = new autocomplete_controller_1.AutocompleteController(ui);
168
167
  const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient, installationsClient, installationsClient);
@@ -179,22 +178,21 @@ const getDependencies = async (cliDetails) => {
179
178
  const iframeResizerScriptService = new cli_shared_1.IframeResizerScriptService();
180
179
  const resourcePackagingService = new resource_packaging_service_1.ResourcePackagingService(archiverFactory, fileReader, process.cwd(), bridgeScriptService, iframeResizerScriptService);
181
180
  const i18nResourceBundlingService = new cli_shared_1.I18nResourceBundlingService();
182
- const nodePackageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(nodeAppPackager, archiveUploader, deployer, resourcePackagingService, i18nResourceBundlingService);
181
+ const packageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(appPackager, archiveUploader, deployer, resourcePackagingService, i18nResourceBundlingService);
183
182
  const roaService = new roa_service_1.RoaService(assertiveAppConfigReader, new graphql_client_8.RoaEligibilityClient(graphQLClient));
184
- const buildController = new build_controller_1.BuildController(new build_view_1.BuildView(ui), lintService, configFile, nodePackageUploadDeployCommand, new build_service_1.BuildService(assertiveAppConfigReader, new graphql_client_10.BuildGraphqlClient(graphQLClient)));
185
- const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, roaService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, nodePackageUploadDeployCommand, createEnvironmentCommand);
183
+ const buildController = new build_controller_1.BuildController(new build_view_1.BuildView(ui), lintService, configFile, packageUploadDeployCommand, new build_service_1.BuildService(assertiveAppConfigReader, new graphql_client_10.BuildGraphqlClient(graphQLClient)));
184
+ const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, roaService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, packageUploadDeployCommand, createEnvironmentCommand);
186
185
  const createSandbox = async (cfg) => new tunnel_2.NodeSandbox(cfg);
187
186
  const functionHost = new tunnel_1.LocalFunctionHost(configFile, ui, createSandbox);
188
- const localInvocationService = new tunnel_1.LocalInvocationService(ui, runtime_1.notImplementedInspector);
189
- const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService, i18nResourceBundlingService), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
187
+ const localInvocationService = new tunnel_1.LocalInvocationService(ui);
188
+ const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService, i18nResourceBundlingService), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, ui, configFile);
190
189
  const tunnelInteractor = new tunnel_1.TunnelInteractor(ui, statsigService);
191
190
  const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
192
191
  const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails);
193
192
  const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, tunnelAnalyticsService);
194
193
  const tunnelView = new tunnel_view_1.TunnelView(ui);
195
194
  const dockerService = new docker_service_1.DockerService();
196
- const dockerTunnelService = new tunnel_service_1.DockerTunnelService(configFilePortFindingService, cachedConfigService, dockerService, tunnelAnalyticsService);
197
- const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, nodeTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore);
195
+ const tunnelController = new tunnel_controller_1.TunnelController(nodeTunnelService, tunnelView, configFile, credentialStore);
198
196
  const stubController = new stubController_1.StubController();
199
197
  const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, cliDetails);
200
198
  const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
@@ -217,7 +215,7 @@ const getDependencies = async (cliDetails) => {
217
215
  installAppSiteCommand,
218
216
  uninstallAppCommand,
219
217
  getAppOwnerQuery,
220
- nodePackageUploadDeployCommand,
218
+ packageUploadDeployCommand,
221
219
  setEnvironmentVariableCommand,
222
220
  deleteEnvironmentVariableCommand,
223
221
  listEnvironmentVariablesCommand,
package/out/command-line/dependency-injection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dependency-injection.js","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dependency-injection.js","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"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"}
package/out/command-line/register-log-commands.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-log-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAO9C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAc9E;AA+FD,eAAO,MAAM,gBAAgB,kDAAmD,YAAY,SAgD3F,CAAC"}
1
+ {"version":3,"file":"register-log-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAO9C,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAc9E;AA+FD,eAAO,MAAM,gBAAgB,kDAAmD,YAAY,SAiD3F,CAAC"}
package/out/command-line/register-log-commands.js CHANGED
@@ -150,9 +150,10 @@ const registerCommands = ({ cmd, ui, commands: { viewAppLogsCommand } }) => {
150
150
  environmentKey: environment,
151
151
  limit,
152
152
  startTime,
153
+ grouped,
153
154
  containers
154
155
  });
155
- [...logs].reverse().forEach((log) => logInvocation(ui, log, grouped, containers));
156
+ [...logs].forEach((log) => logInvocation(ui, log, grouped, containers));
156
157
  }
157
158
  });
158
159
  };
package/out/command-line/register-log-commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-log-commands.js","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":";;;;AAAA,oEAAmE;AAGnE,kDAAyD;AAEzD,kDAAgF;AAChF,kDAAyC;AACzC,0DAA0B;AAC1B,mEAAmC;AAEnC,eAAK,CAAC,MAAM,CAAC,aAAG,CAAC,CAAC;AAIlB,MAAM,aAAa,GAAG,EAAE,CAAC;AAEzB,MAAa,gBAAiB,SAAQ,KAAK;CAAG;AAA9C,4CAA8C;AAE9C,SAAS,UAAU,CAAC,KAAa;IAC/B,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC;IACzD,OAAO,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC;AACvD,CAAC;AAED,SAAgB,kBAAkB,CAAC,QAA4B;IAC7D,IAAI,MAAM,CAAC;IAEX,IAAI,QAAQ,EAAE;QACZ,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAEtE,IAAI,KAAK,EAAE;YACT,MAAM,GAAG,IAAA,eAAK,GAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAQ,CAAC,CAAC;SAC1G;aAAM;YACL,MAAM,GAAG,eAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SAC9B;KACF;IAED,OAAO,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC;AAdD,gDAcC;AAED,SAAS,eAAe,CAAC,OAA2B,EAAE,KAAU;IAC9D,IAAI,KAAK,EAAE;QACT,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;KAC9C;SAAM;QACL,OAAO,CAAC,OAAO,CAAC,CAAC;KAClB;AACH,CAAC;AAID,SAAS,OAAO,CAAC,MAAc,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAc,EAAE,UAAmB;IAC/G,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;QACpD,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAA,iCAAoB,EAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;SACjG;aAAM;YACL,MAAM,CAAC,IAAI,CACT,IAAA,kCAAqB,EAAC,KAAK,CAAC;gBAC1B,GAAG;gBACH,SAAS;gBACT,GAAG;gBACH,EAAE;gBACF,GAAG;gBACH,IAAA,iCAAoB,EAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CACxD,CAAC;SACH;QAED,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,oBAAoB,UAAU,EAAE,CAAC,CAAC;SAChD;QAED,IAAI,EAAE,EAAE;YACN,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;SAC1C;QACD,IAAI,OAAO,EAAE;YACX,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;SAClD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,MAAc,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAc;IAC7F,IAAI,MAAM,CAAC,YAAY,EAAE;QACvB,MAAM,KAAK,GAAG,IAAI,oBAAK,CAAC,uBAAU,CAAC,UAAU,CAAmC,CAAC;QACjF,KAAK,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QACpC,IAAI,EAAE,EAAE;YACN,KAAK,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;SACrC;QACD,IAAI,OAAO,EAAE;YACX,KAAK,CAAC,IAAI,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;SAC7C;QACD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KAClB;SAAM;QACL,MAAM,CAAC,IAAI,CAAC,qBAAQ,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;KAClD;IAED,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;QACpD,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,MAAM,CAAC,IAAI,CACT,IAAA,kCAAqB,EAAC,KAAK,CAAC;gBAC1B,GAAG;gBACH,SAAS;gBACT,GAAG;gBACH,EAAE;gBACF,GAAG;gBACH,IAAA,iCAAoB,EAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CACxD,CAAC;YAEF,MAAM,CAAC,KAAK,CAAC,oBAAoB,UAAU,EAAE,CAAC,CAAC;YAC/C,IAAI,EAAE,EAAE;gBACN,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;aAC1C;YACD,IAAI,OAAO,EAAE;gBACX,MAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;aAClD;SACF;aAAM;YACL,MAAM,CAAC,IAAI,CACT,IAAA,kCAAqB,EAAC,KAAK,CAAC;gBAC1B,GAAG;gBACH,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACvB,GAAG;gBACH,IAAA,iCAAoB,EAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CACxD,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,MAAc,EAAE,UAAsB,EAAE,OAAgB,EAAE,UAAmB;IAClG,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AACrF,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,kBAAkB,EAAE,EAAgB,EAAE,EAAE;IAC9F,GAAG;SACA,OAAO,CAAC,MAAM,CAAC;SACf,YAAY,EAAE;SACd,WAAW,CAAC,iBAAI,CAAC,IAAI,CAAC,GAAG,CAAC;SAC1B,MAAM,CAAC,kBAAkB,EAAE,iBAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC;SAC7D,iBAAiB,EAAE;SACnB,MAAM,CAAC,+BAA+B,EAAE,iBAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;SACnE,MAAM,CAAC,qBAAqB,EAAE,iBAAI,CAAC,IAAI,CAAC,WAAW,CAAC;SACpD,MAAM,CAAC,qBAAqB,EAAE,iBAAI,CAAC,IAAI,CAAC,WAAW,CAAC;SACpD,MAAM,CAAC,eAAe,EAAE,iBAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;QACzF,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAE9D,IAAI,UAAU,EAAE;YACd,IAAI,UAAU,EAAE;gBACd,EAAE,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,iBAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/E,EAAE,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;aACR;YAED,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;gBAC1C,cAAc,EAAE,WAAW;gBAC3B,YAAY,EAAE,UAAU;aACzB,CAAC,CAAC;YACH,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SACxC;aAAM;YACL,IAAI,UAAU,IAAI,OAAO,EAAE;gBACzB,EAAE,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,iBAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/E,EAAE,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;aACR;YAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAE5C,IAAI,KAAK,IAAI,CAAC,SAAS,EAAE;gBACvB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;aAC9C;YAED,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;gBAC3C,cAAc,EAAE,WAAW;gBAC3B,KAAK;gBACL,SAAS;gBACT,UAAU;aACX,CAAC,CAAC;YACH,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;SACnF;IACH,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAhDW,QAAA,gBAAgB,oBAgD3B"}
1
+ {"version":3,"file":"register-log-commands.js","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"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"}
package/out/command-line/register-version-commands.js CHANGED
@@ -119,8 +119,8 @@ const registerDiffCommands = (parent, { controllers: { versionController, defaul
119
119
  .requireAppId()
120
120
  .environmentOption()
121
121
  .nonInteractiveOption()
122
- .option('-v1, --version1 <version>', cli_shared_1.Text.version.diff.option.version1)
123
- .option('-v2, --version2 <version>', cli_shared_1.Text.version.diff.option.version2)
122
+ .option('--version1 <version>', cli_shared_1.Text.version.diff.option.version1)
123
+ .option('--version2 <version>', cli_shared_1.Text.version.diff.option.version2)
124
124
  .option('--environment1 <environment>', cli_shared_1.Text.version.diff.option.environment1)
125
125
  .precondition((0, command_1.environmentPrecondition)('environment1', defaultEnvironmentController))
126
126
  .option('--environment2 <environment>', cli_shared_1.Text.version.diff.option.environment2)
package/out/command-line/register-version-commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-version-commands.js","sourceRoot":"","sources":["../../src/command-line/register-version-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"register-version-commands.js","sourceRoot":"","sources":["../../src/command-line/register-version-commands.ts"],"names":[],"mappings":";;;AACA,kDAA0D;AAC1D,uCAA6D;AAE7D,SAAgB,iBAAiB,CAAC,eAAuB,EAAE,QAAiB;IAC1E,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QAClC,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACnF;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAC9C,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACnF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AATD,8CASC;AAED,MAAM,uBAAuB,GAAG,CAAC,MAAe,EAAE,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,EAAgB,EAAE,EAAE;IACxG,MAAM;SACH,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;SACnC,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;SACpC,YAAY,EAAE;SACd,iBAAiB,EAAE;SACnB,oBAAoB,EAAE;SACtB,MAAM,CAAC,+BAA+B,EAAE,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;SAC/E,MAAM,CAAC,QAAQ,EAAE,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;SAChD,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;SACrE,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE;QAC7E,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnF,MAAM,iBAAiB,CAAC,oBAAoB,CAAC;YAC3C,WAAW;YACX,YAAY,EAAE,eAAe;YAC7B,IAAI;YACJ,OAAO;YACP,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,MAAe,EAAE,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,EAAgB,EAAE,EAAE;IACrG,MAAM;SACH,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;SAClC,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACnC,YAAY,EAAE;SACd,iBAAiB,EAAE;SACnB,oBAAoB,EAAE;SACtB,MAAM,CAAC,QAAQ,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SAC/C,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;SACpE,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE;QAC/D,MAAM,iBAAiB,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IACzF,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,CAAC,MAAe,EAAE,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,EAAgB,EAAE,EAAE;IAC7G,MAAM;SACH,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;SAC3C,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;SAC5C,YAAY,EAAE;SACd,iBAAiB,EAAE;SACnB,oBAAoB,EAAE;SACtB,UAAU,EAAE;SACZ,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;SAC7E,MAAM,CAAC,8BAA8B,EAAE,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;SAClF,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC9E,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,EAAE;QACvF,MAAM,gBAAgB,GAAG,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,iBAAiB,CAAC,oBAAoB,CAAC;YAC3C,WAAW;YACX,IAAI;YACJ,OAAO;YACP,cAAc;YACd,gBAAgB;YAChB,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AACF,MAAM,6BAA6B,GAAG,CAAC,MAAe,EAAE,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,EAAgB,EAAE,EAAE;IAC9G,MAAM;SACH,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;SAC5C,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;SAC7C,iBAAiB,EAAE;SACnB,oBAAoB,EAAE;SACtB,UAAU,EAAE;SACZ,MAAM,CAAC,iCAAiC,EAAE,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;SAC1F,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;SAC9E,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,EAAE;QAC7E,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;SAC1F;QACD,MAAM,iBAAiB,CAAC,2BAA2B,CAAC;YAClD,WAAW;YACX,IAAI;YACJ,OAAO;YACP,YAAY;YACZ,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,MAAe,EAAE,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,EAAgB,EAAE,EAAE;IAC5G,MAAM;SACH,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;SAC1C,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SAC3C,YAAY,EAAE;SACd,iBAAiB,EAAE;SACnB,oBAAoB,EAAE;SACtB,UAAU,EAAE;SACZ,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;SAC5E,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE;QAC/D,MAAM,iBAAiB,CAAC,mBAAmB,CAAC;YAC1C,WAAW;YACX,IAAI;YACJ,OAAO;YACP,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,MAAe,EACf,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,EAAgB,EAClF,EAAE;IACF,MAAM;SACH,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;SAClC,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;SACnC,YAAY,EAAE;SACd,iBAAiB,EAAE;SACnB,oBAAoB,EAAE;SACtB,MAAM,CAAC,sBAAsB,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;SACjE,MAAM,CAAC,sBAAsB,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;SACjE,MAAM,CAAC,8BAA8B,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;SAC7E,YAAY,CAAC,IAAA,iCAAuB,EAA2B,cAAc,EAAE,4BAA4B,CAAC,CAAC;SAC7G,MAAM,CAAC,8BAA8B,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;SAC7E,YAAY,CAAC,IAAA,iCAAuB,EAA2B,cAAc,EAAE,4BAA4B,CAAC,CAAC;SAC7G,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;SACpE,MAAM,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,EAAE;QACzF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YAC1B,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;SACtE;QAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC9D,MAAM,iBAAiB,CAAC,iBAAiB,CAAC;YACxC,WAAW;YACX,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,WAAW;YACrB,OAAO;YACP,YAAY;YACZ,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAkB,EAAE,EAAE;IACrD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACrB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7G,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvC,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpC,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpC,4BAA4B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5C,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3C,6BAA6B,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B"}
package/out/command-line/version-info.js CHANGED
@@ -21,7 +21,7 @@ const getCLIDetails = () => {
21
21
  }
22
22
  };
23
23
  exports.getCLIDetails = getCLIDetails;
24
- const supportedNodeMajorVersions = [18, 20, 22];
24
+ const supportedNodeMajorVersions = [20, 22];
25
25
  exports.semverSupportedNodeVersion = supportedNodeMajorVersions.map((v) => `${v}.x`).join(' || ');
26
26
  exports.humanReadableSupportedNodeVersion = supportedNodeMajorVersions
27
27
  .map((v) => `${v}.x`)
package/out/command-line/version-info.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version-info.js","sourceRoot":"","sources":["../../src/command-line/version-info.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE1D,kDAA2D;AAEpD,MAAM,aAAa,GAAG,GAA2B,EAAE;IACxD,IAAI;QAEF,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAS,yBAAiB,CAAC,CAAC;QAEzD,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM,EAAE,MAAM;YACd,qBAAqB,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;SAChD,CAAC;KACH;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAhBW,QAAA,aAAa,iBAgBxB;AAEF,MAAM,0BAA0B,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACnC,QAAA,0BAA0B,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC1F,QAAA,iCAAiC,GAAG,0BAA0B;KACxE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;KACpB,IAAI,CAAC,IAAI,CAAC;KACV,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;AAEnC,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAiB,EAAE;IACtE,MAAM,aAAa,GAAG,CAAC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,CAAC,GAAG,CAAC,yBAAiB,EAAE,MAAM,EAAE,8BAAsB,CAAC,CAAC;AACpE,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEK,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;IAChD,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAC;AACvC,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B"}
1
+ {"version":3,"file":"version-info.js","sourceRoot":"","sources":["../../src/command-line/version-info.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE1D,kDAA2D;AAEpD,MAAM,aAAa,GAAG,GAA2B,EAAE;IACxD,IAAI;QAEF,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAS,yBAAiB,CAAC,CAAC;QAEzD,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM,EAAE,MAAM;YACd,qBAAqB,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI;SAChD,CAAC;KACH;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAhBW,QAAA,aAAa,iBAgBxB;AAEF,MAAM,0BAA0B,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC/B,QAAA,0BAA0B,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC1F,QAAA,iCAAiC,GAAG,0BAA0B;KACxE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;KACpB,IAAI,CAAC,IAAI,CAAC;KACV,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;AAEnC,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAiB,EAAE;IACtE,MAAM,aAAa,GAAG,CAAC,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/D,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,CAAC,GAAG,CAAC,yBAAiB,EAAE,MAAM,EAAE,8BAAsB,CAAC,CAAC;AACpE,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B;AAEK,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;IAChD,MAAM,UAAU,GAAG,uBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAC;AACvC,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B"}
package/out/command-line/view/tunnel-view.d.ts CHANGED
@@ -1,22 +1,8 @@
1
- /// <reference types="node" />
2
- import { exitOnError, UI, UserError } from '@forge/cli-shared';
3
- import { spawn } from 'cross-spawn';
4
- export interface DownloadProgressCallbacks {
5
- onStart: () => void;
6
- onSuccess: () => void;
7
- onFailure: () => void;
8
- }
9
- export declare class TunnelViewError extends UserError {
10
- }
1
+ import { UI } from '@forge/cli-shared';
11
2
  export declare class TunnelView {
12
3
  private readonly ui;
13
- private readonly FAILED_DOCKER_CONNECTION_MESSAGE;
14
4
  constructor(ui: UI);
15
- dockerPreamble(environmentKey?: string): void;
16
- getTunnelErrorHandler(exitFn: typeof exitOnError): (err: Error) => Promise<void>;
17
- updatePullPercent(dataBuffer: Buffer, dockerPullPercent: number): number;
18
- calculateProgress(progress: string, regex: RegExp, dockerPullPercent: number, clamp: number): number;
19
- reportDownloadProgress(imageDownloadChildProcess: ReturnType<typeof spawn>, { onStart, onFailure, onSuccess }: DownloadProgressCallbacks): Promise<void>;
5
+ preamble(environmentKey?: string): void;
20
6
  displayUIKit1DeprecationMessage: (modules: string[]) => void;
21
7
  }
22
8
  //# sourceMappingURL=tunnel-view.d.ts.map
package/out/command-line/view/tunnel-view.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EAIX,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,EAAE;IAD/B,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAyC;gBAC7D,EAAE,EAAE,EAAE;IAE5B,cAAc,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAY7C,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;IAqDT,+BAA+B,YAAa,MAAM,EAAE,KAAG,IAAI,CAIhE;CACH"}
1
+ {"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE5F,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAWvC,+BAA+B,YAAa,MAAM,EAAE,KAAG,IAAI,CAIhE;CACH"}
package/out/command-line/view/tunnel-view.js CHANGED
@@ -1,21 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.TunnelView = exports.TunnelViewError = void 0;
4
- const tslib_1 = require("tslib");
3
+ exports.TunnelView = void 0;
5
4
  const cli_shared_1 = require("@forge/cli-shared");
6
- const ora_1 = tslib_1.__importDefault(require("ora"));
7
- class TunnelViewError extends cli_shared_1.UserError {
8
- }
9
- exports.TunnelViewError = TunnelViewError;
10
5
  class TunnelView {
11
6
  ui;
12
- FAILED_DOCKER_CONNECTION_MESSAGE = 'Cannot connect to the Docker daemon';
13
7
  constructor(ui) {
14
8
  this.ui = ui;
15
9
  }
16
- dockerPreamble(environmentKey) {
10
+ preamble(environmentKey) {
17
11
  this.ui.info(cli_shared_1.Text.tunnel.preamble);
18
- this.ui.debug(cli_shared_1.Text.tunnel.tunnelType);
19
12
  if (environmentKey && environmentKey !== cli_shared_1.DEFAULT_ENVIRONMENT_KEY) {
20
13
  this.ui.emptyLine();
21
14
  this.ui.info(cli_shared_1.Text.tunnel.startingTunnel(environmentKey, (0, cli_shared_1.guessEnvironmentType)(environmentKey)));
@@ -24,87 +17,6 @@ class TunnelView {
24
17
  this.ui.info(cli_shared_1.Text.ctrlC);
25
18
  this.ui.emptyLine();
26
19
  }
27
- getTunnelErrorHandler(exitFn) {
28
- const handler = async (err) => {
29
- if (this.ui.debugEnabled)
30
- this.ui.error(err);
31
- return await exitFn(this.ui, new TunnelViewError(cli_shared_1.Text.tunnel.error.tunnelPackageMissing));
32
- };
33
- return handler;
34
- }
35
- updatePullPercent(dataBuffer, dockerPullPercent) {
36
- const regexPullStarted = /(Pulling fs layer)/g;
37
- const regexWait = /(Waiting)/g;
38
- const regexVerify = /(Verifying Checksum)/g;
39
- const regexDownloadComplete = /(Download complete)/g;
40
- const regexPullComplete = /(Pull complete)/g;
41
- const regexDigest = /(Digest: )/g;
42
- const progress = dataBuffer.toString();
43
- if (dockerPullPercent >= 99) {
44
- return dockerPullPercent;
45
- }
46
- if (progress.match(regexPullComplete) || progress.match(regexDigest)) {
47
- dockerPullPercent = 99;
48
- return dockerPullPercent;
49
- }
50
- if (progress.match(regexDownloadComplete) && dockerPullPercent < 95) {
51
- dockerPullPercent = 95;
52
- return dockerPullPercent;
53
- }
54
- dockerPullPercent = this.calculateProgress(progress, regexPullStarted, dockerPullPercent, 33);
55
- dockerPullPercent = this.calculateProgress(progress, regexWait, dockerPullPercent, 66);
56
- dockerPullPercent = this.calculateProgress(progress, regexVerify, dockerPullPercent, 92);
57
- return dockerPullPercent;
58
- }
59
- calculateProgress(progress, regex, dockerPullPercent, clamp) {
60
- if (progress.match(regex) && dockerPullPercent <= clamp) {
61
- const expectedNewPercent = dockerPullPercent + progress.match(regex).length * 3;
62
- return Math.min(expectedNewPercent, clamp);
63
- }
64
- return dockerPullPercent;
65
- }
66
- reportDownloadProgress(imageDownloadChildProcess, { onStart, onFailure, onSuccess }) {
67
- return new Promise((resolve, reject) => {
68
- let dockerPullPercent = 0;
69
- const spinner = (0, ora_1.default)({
70
- spinner: {
71
- frames: ['']
72
- },
73
- prefixText: cli_shared_1.Text.tunnel.pullDockerProgress(dockerPullPercent)
74
- }).start();
75
- onStart();
76
- imageDownloadChildProcess.stdout?.on('data', (data) => {
77
- dockerPullPercent = this.updatePullPercent(data, dockerPullPercent);
78
- spinner.prefixText = cli_shared_1.Text.tunnel.pullDockerProgress(dockerPullPercent);
79
- });
80
- let stderr = '';
81
- imageDownloadChildProcess.stderr?.on('data', (data) => {
82
- stderr += data.toString();
83
- });
84
- imageDownloadChildProcess.on('exit', (code) => {
85
- if (code !== 0) {
86
- spinner.prefixText = cli_shared_1.Text.tunnel.error.pullDocker;
87
- spinner.stopAndPersist();
88
- this.ui.warn(cli_shared_1.Text.tunnel.error.dockerPullFailed);
89
- stderr = stderr.trim();
90
- if (stderr.includes(this.FAILED_DOCKER_CONNECTION_MESSAGE)) {
91
- this.ui.warn(cli_shared_1.Text.tunnel.error.dockerDaemonNotRunning(stderr, this.ui.debugEnabled));
92
- }
93
- else {
94
- this.ui.warn(stderr);
95
- }
96
- onFailure();
97
- reject(new TunnelViewError(cli_shared_1.Text.tunnel.error.dockerPullFailed));
98
- return;
99
- }
100
- spinner.prefixText = cli_shared_1.Text.tunnel.pullDockerProgress(100);
101
- spinner.stopAndPersist();
102
- this.ui.info(cli_shared_1.LogColor.trace(cli_shared_1.Text.tunnel.pullDockerSuccess));
103
- onSuccess();
104
- resolve();
105
- });
106
- });
107
- }
108
20
  displayUIKit1DeprecationMessage = (modules) => {
109
21
  this.ui.emptyLine();
110
22
  this.ui.warn(cli_shared_1.Text.warning.deprecation.uikit(modules));