@forge/cli 12.3.1-next.1-experimental-b695d2e → 12.4.0-next.10

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 (48) hide show
  1. package/CHANGELOG.md +97 -10
  2. package/npm-shrinkwrap.json +53 -53
  3. package/out/analytics-client/analytics-client.d.ts +12 -11
  4. package/out/analytics-client/analytics-client.d.ts.map +1 -1
  5. package/out/analytics-client/analytics-client.js +30 -23
  6. package/out/analytics-client/analytics-client.js.map +1 -1
  7. package/out/analytics-client/analytics-message-handler.d.ts +13 -5
  8. package/out/analytics-client/analytics-message-handler.d.ts.map +1 -1
  9. package/out/analytics-client/analytics-message-handler.js +8 -7
  10. package/out/analytics-client/analytics-message-handler.js.map +1 -1
  11. package/out/bin/postinstall.js +18 -13
  12. package/out/bin/postinstall.js.map +1 -1
  13. package/out/command-line/command.d.ts +1 -2
  14. package/out/command-line/command.d.ts.map +1 -1
  15. package/out/command-line/command.js +9 -21
  16. package/out/command-line/command.js.map +1 -1
  17. package/out/command-line/controller/tunnel-controller.d.ts +3 -4
  18. package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
  19. package/out/command-line/controller/tunnel-controller.js +3 -6
  20. package/out/command-line/controller/tunnel-controller.js.map +1 -1
  21. package/out/command-line/dependency-injection.d.ts.map +1 -1
  22. package/out/command-line/dependency-injection.js +5 -7
  23. package/out/command-line/dependency-injection.js.map +1 -1
  24. package/out/command-line/index.d.ts +1 -1
  25. package/out/command-line/index.d.ts.map +1 -1
  26. package/out/command-line/index.js +3 -3
  27. package/out/command-line/index.js.map +1 -1
  28. package/out/command-line/register-app-commands.d.ts +9 -4
  29. package/out/command-line/register-app-commands.d.ts.map +1 -1
  30. package/out/command-line/register-app-commands.js +100 -68
  31. package/out/command-line/register-app-commands.js.map +1 -1
  32. package/out/command-line/register-authentication-command.d.ts +1 -2
  33. package/out/command-line/register-authentication-command.d.ts.map +1 -1
  34. package/out/command-line/register-authentication-command.js +0 -1
  35. package/out/command-line/register-authentication-command.js.map +1 -1
  36. package/out/command-line/register-tunnel-commands.d.ts +1 -1
  37. package/out/command-line/register-tunnel-commands.d.ts.map +1 -1
  38. package/out/command-line/register-tunnel-commands.js +2 -2
  39. package/out/command-line/register-tunnel-commands.js.map +1 -1
  40. package/out/service/tunnel-service.d.ts +5 -15
  41. package/out/service/tunnel-service.d.ts.map +1 -1
  42. package/out/service/tunnel-service.js +12 -34
  43. package/out/service/tunnel-service.js.map +1 -1
  44. package/package.json +8 -8
  45. package/out/service/tunnel-analytics-service.d.ts +0 -11
  46. package/out/service/tunnel-analytics-service.d.ts.map +0 -1
  47. package/out/service/tunnel-analytics-service.js +0 -28
  48. package/out/service/tunnel-analytics-service.js.map +0 -1
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.registerCommands = exports.filterTemplatesByProduct = exports.createCommandHandler = exports.directoryNameFromAppName = exports.templateMatchesProduct = exports.formatProduct = exports.CATEGORY_PREDICATES = exports.PRODUCT_OPTIONS_DISPLAY = exports.TemplateContext = exports.TemplateCategory = void 0;
3
+ exports.registerCommands = exports.filterTemplatesByProduct = exports.createCommandHandler = exports.isValidDevSpaceId = exports.directoryNameFromAppName = exports.templateMatchesProduct = exports.formatProduct = exports.CATEGORY_PREDICATES = exports.PRODUCT_OPTIONS_DISPLAY = exports.TemplateContext = exports.TemplateCategory = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const fs_1 = tslib_1.__importDefault(require("fs"));
6
6
  const sanitize_filename_1 = tslib_1.__importDefault(require("sanitize-filename"));
@@ -20,11 +20,11 @@ var TemplateContext;
20
20
  TemplateContext["BITBUCKET"] = "bitbucket";
21
21
  TemplateContext["COMPASS"] = "compass";
22
22
  TemplateContext["CONFLUENCE"] = "confluence";
23
+ TemplateContext["DASHBOARDS"] = "dashboards";
23
24
  TemplateContext["JIRA"] = "jira";
24
25
  TemplateContext["JIRA_SERVICE_MANAGEMENT"] = "jira-service-management";
25
26
  TemplateContext["TEAMWORK_GRAPH"] = "teamwork-graph";
26
27
  TemplateContext["ROVO"] = "rovo";
27
- TemplateContext["DASHBOARDS"] = "dashboards";
28
28
  TemplateContext["CROSS_CONTEXT"] = "cross-context";
29
29
  })(TemplateContext = exports.TemplateContext || (exports.TemplateContext = {}));
30
30
  const PRODUCT_OPTIONS = {
@@ -33,17 +33,17 @@ const PRODUCT_OPTIONS = {
33
33
  [TemplateContext.BITBUCKET]: [TemplateContext.BITBUCKET],
34
34
  [TemplateContext.COMPASS]: [TemplateContext.COMPASS],
35
35
  [TemplateContext.CONFLUENCE]: [TemplateContext.CONFLUENCE],
36
+ [TemplateContext.DASHBOARDS]: [TemplateContext.DASHBOARDS],
36
37
  [TemplateContext.JIRA]: [TemplateContext.JIRA],
37
38
  [TemplateContext.JIRA_SERVICE_MANAGEMENT]: [TemplateContext.JIRA_SERVICE_MANAGEMENT],
38
39
  [TemplateContext.TEAMWORK_GRAPH]: [TemplateContext.TEAMWORK_GRAPH],
39
40
  [TemplateContext.ROVO]: [TemplateContext.ROVO],
40
- [TemplateContext.DASHBOARDS]: [TemplateContext.DASHBOARDS],
41
41
  [TemplateContext.CROSS_CONTEXT]: [
42
42
  TemplateContext.COMPASS,
43
43
  TemplateContext.CONFLUENCE,
44
+ TemplateContext.DASHBOARDS,
44
45
  TemplateContext.JIRA,
45
- TemplateContext.JIRA_SERVICE_MANAGEMENT,
46
- TemplateContext.DASHBOARDS
46
+ TemplateContext.JIRA_SERVICE_MANAGEMENT
47
47
  ]
48
48
  };
49
49
  exports.PRODUCT_OPTIONS_DISPLAY = {
@@ -120,27 +120,65 @@ function directoryNameFromAppName(appName) {
120
120
  return allDashes ? undefined : normalized;
121
121
  }
122
122
  exports.directoryNameFromAppName = directoryNameFromAppName;
123
- async function createCommandHandler(ui, createAppCommand, name, { template, directory }, devSpaceService, statsigService) {
124
- const isDevSpaceSelectionEnabled = await statsigService.isDevSpaceSelectionEnabled();
123
+ const isValidDevSpaceId = (devSpaceId) => {
124
+ const UUID_PATTERN = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
125
+ return UUID_PATTERN.test(devSpaceId);
126
+ };
127
+ exports.isValidDevSpaceId = isValidDevSpaceId;
128
+ async function handleDevSpaceSelection(ui, devSpaceService, devSpaceId, commandContext) {
125
129
  let isNewlyCreatedDevSpace = false;
126
- let devSpaceId;
127
- if (isDevSpaceSelectionEnabled) {
128
- ui.emptyLine();
129
- ui.info(cli_shared_1.Text.ctrlC);
130
- ui.emptyLine();
131
- const devSpaces = await devSpaceService.getDevSpaces(ui);
132
- const devSpaceResult = await devSpaceService.selectDevSpace(ui, devSpaces, 'create');
130
+ let selectedDevSpace;
131
+ ui.emptyLine();
132
+ ui.info(cli_shared_1.Text.ctrlC);
133
+ ui.emptyLine();
134
+ const devSpaces = await devSpaceService.getDevSpaces(ui);
135
+ if (devSpaceId) {
136
+ selectedDevSpace = devSpaces.find((ds) => ds.id === devSpaceId);
137
+ if (!selectedDevSpace) {
138
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.devSpace.invalidSpaceName(devSpaceId));
139
+ }
140
+ }
141
+ else {
142
+ if (commandContext === 'register' && devSpaces.length) {
143
+ ui.info(cli_shared_1.Text.devSpace.assignmentInfo);
144
+ ui.emptyLine();
145
+ ui.info(cli_shared_1.Text.devSpace.selectionPrompt);
146
+ ui.emptyLine();
147
+ }
148
+ const devSpaceResult = await devSpaceService.selectDevSpace(ui, devSpaces, commandContext);
133
149
  if (!devSpaceResult) {
134
- return;
150
+ return null;
135
151
  }
136
- isNewlyCreatedDevSpace = devSpaceResult.isNewlyCreated;
137
- devSpaceId = devSpaceResult.devSpace.id;
138
152
  ui.emptyLine();
139
- if (!isNewlyCreatedDevSpace) {
140
- ui.info(cli_shared_1.Text.devSpace.contributingToSpace(devSpaceResult.devSpace.name));
141
- }
142
- ui.clearSpinner();
153
+ isNewlyCreatedDevSpace = devSpaceResult.isNewlyCreated;
154
+ selectedDevSpace = devSpaceResult.devSpace;
155
+ }
156
+ if (!isNewlyCreatedDevSpace && selectedDevSpace) {
157
+ const messageText = commandContext === 'create'
158
+ ? cli_shared_1.Text.devSpace.contributingToSpace(selectedDevSpace.name)
159
+ : cli_shared_1.Text.devSpace.assigningToSpace(selectedDevSpace.name);
160
+ ui.info(messageText);
143
161
  }
162
+ ui.clearSpinner();
163
+ return {
164
+ selectedDevSpace,
165
+ isNewlyCreatedDevSpace
166
+ };
167
+ }
168
+ async function createCommandHandler(ui, createAppCommand, name, { template, directory, devSpaceId }, devSpaceService, isDevSpaceSelectionEnabled) {
169
+ if (isDevSpaceSelectionEnabled && devSpaceId && !(0, exports.isValidDevSpaceId)(devSpaceId)) {
170
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.devSpace.invalidSpaceId(devSpaceId));
171
+ }
172
+ const devSpaceResult = isDevSpaceSelectionEnabled
173
+ ? await handleDevSpaceSelection(ui, devSpaceService, devSpaceId, 'create')
174
+ : null;
175
+ if (isDevSpaceSelectionEnabled && devSpaceResult === null) {
176
+ return;
177
+ }
178
+ const { selectedDevSpace, isNewlyCreatedDevSpace } = devSpaceResult || {
179
+ selectedDevSpace: undefined,
180
+ isNewlyCreatedDevSpace: false
181
+ };
144
182
  directory = prepareDirectoryForApp(ui, name, template, directory);
145
183
  if (!isDevSpaceSelectionEnabled) {
146
184
  ui.info(cli_shared_1.Text.ctrlC);
@@ -155,7 +193,7 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
155
193
  template,
156
194
  directory,
157
195
  ...(selection.requiredContext && { requiredProduct: selection.requiredContext }),
158
- ...(devSpaceId && { developerSpaceId: devSpaceId })
196
+ ...(selectedDevSpace?.id && { developerSpaceId: selectedDevSpace?.id })
159
197
  };
160
198
  const result = await ui.displayProgress(() => createAppCommand.execute(args), cli_shared_1.Text.create.cmd.start, cli_shared_1.Text.create.cmd.success(name));
161
199
  ui.info(cli_shared_1.Text.create.cmd.successDetails(directory, result.environments));
@@ -213,7 +251,7 @@ async function promptAndSelectTemplate(ui, createAppCommand, template, directory
213
251
  ui.info(cli_shared_1.Text.create.overviewTemplates);
214
252
  const templates = await ui.displayTemporaryMessage(() => createAppCommand.getAvailableTemplates(), cli_shared_1.Text.create.waitTemplates);
215
253
  const templatesWithoutCsuik = templates.filter((template) => !template.includes('csuik'));
216
- const productOptions = await createAppCommand.filterAvailableProducts(Object.values(TemplateContext), TemplateContext.TEAMWORK_GRAPH, TemplateContext.CROSS_CONTEXT, TemplateContext.DASHBOARDS);
254
+ const productOptions = await createAppCommand.filterAvailableProducts(Object.values(TemplateContext), TemplateContext.TEAMWORK_GRAPH, TemplateContext.CROSS_CONTEXT);
217
255
  const productName = await ui.promptForList(cli_shared_1.Text.create.promptProduct, productOptions, {
218
256
  format: formatProduct
219
257
  }, productOptions.length);
@@ -239,14 +277,9 @@ async function promptAndSelectTemplate(ui, createAppCommand, template, directory
239
277
  template
240
278
  };
241
279
  }
242
- function removeDashboardTemplatesIfDashboardsNotEnabled(templates, productOptions) {
243
- return productOptions.includes(TemplateContext.DASHBOARDS)
244
- ? templates
245
- : templates.filter((template) => !templateMatchesProduct(TemplateContext.DASHBOARDS, template, productOptions));
246
- }
247
280
  function filterTemplatesByProduct(templates, product, productOptions) {
248
281
  return product === 'show-all'
249
- ? removeDashboardTemplatesIfDashboardsNotEnabled(templates, productOptions)
282
+ ? templates
250
283
  : templates.filter((template) => templateMatchesProduct(product, template, productOptions));
251
284
  }
252
285
  exports.filterTemplatesByProduct = filterTemplatesByProduct;
@@ -267,49 +300,48 @@ function modifyTemplateByCategory(template, category) {
267
300
  return template;
268
301
  }
269
302
  }
270
- function registerCreateCommands(deps) {
303
+ async function registerCreateCommands(deps) {
271
304
  const { cmd, ui, commands: { createAppCommand }, services: { devSpaceService, statsigService } } = deps;
272
- cmd
305
+ const isDevSpaceSelectionEnabled = await statsigService.isDevSpaceSelectionEnabled();
306
+ const createCommand = cmd
273
307
  .command('create [name]')
274
308
  .description(cli_shared_1.Text.create.cmd.desc)
275
309
  .option('-t, --template <template name>', cli_shared_1.Text.create.optionTemplate)
276
- .option('-d, --directory <directory name>', cli_shared_1.Text.create.optionDirectory)
277
- .action((name, options) => createCommandHandler(ui, createAppCommand, name, options, devSpaceService, statsigService));
310
+ .option('-d, --directory <directory name>', cli_shared_1.Text.create.optionDirectory);
311
+ if (isDevSpaceSelectionEnabled) {
312
+ createCommand.option('-s, --devSpaceId <devspace id>', cli_shared_1.Text.create.optionSpace);
313
+ }
314
+ createCommand.action((name, options) => {
315
+ return createCommandHandler(ui, createAppCommand, name, options, devSpaceService, isDevSpaceSelectionEnabled);
316
+ });
278
317
  }
279
- function registerRegisterCommand({ cmd, ui, commands: { registerAppCommand }, services: { devSpaceService, statsigService } }) {
280
- cmd
281
- .command('register [name]')
282
- .description(cli_shared_1.Text.register.cmd.desc)
318
+ async function registerRegisterCommand({ cmd, ui, commands: { registerAppCommand }, services: { devSpaceService, statsigService } }) {
319
+ const isDevSpaceSelectionEnabled = await statsigService.isDevSpaceSelectionEnabled();
320
+ const registerCommand = cmd.command('register [name]').description(cli_shared_1.Text.register.cmd.desc);
321
+ if (isDevSpaceSelectionEnabled) {
322
+ registerCommand.option('-s, --devSpaceId <devspace id>', cli_shared_1.Text.create.optionSpace);
323
+ }
324
+ registerCommand
283
325
  .requireManifestFile()
284
- .action(async (name) => {
285
- const isDevSpaceSelectionEnabled = await statsigService.isDevSpaceSelectionEnabled();
286
- let isNewlyCreatedDevSpace = false;
287
- let devSpaceId;
326
+ .action(async (name, options) => {
327
+ const { devSpaceId } = options;
328
+ if (isDevSpaceSelectionEnabled && devSpaceId && !(0, exports.isValidDevSpaceId)(devSpaceId)) {
329
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.devSpace.invalidSpaceId(devSpaceId));
330
+ }
331
+ const devSpaceResult = isDevSpaceSelectionEnabled
332
+ ? await handleDevSpaceSelection(ui, devSpaceService, devSpaceId, 'register')
333
+ : null;
334
+ if (isDevSpaceSelectionEnabled && devSpaceResult === null) {
335
+ return;
336
+ }
337
+ const { selectedDevSpace, isNewlyCreatedDevSpace } = devSpaceResult || {
338
+ selectedDevSpace: undefined,
339
+ isNewlyCreatedDevSpace: false
340
+ };
288
341
  if (isDevSpaceSelectionEnabled) {
289
- ui.emptyLine();
290
- ui.info(cli_shared_1.Text.ctrlC);
291
- ui.emptyLine();
292
- const devSpaces = await devSpaceService.getDevSpaces(ui);
293
- if (devSpaces.length) {
294
- ui.info(cli_shared_1.Text.devSpace.assignmentInfo);
295
- ui.emptyLine();
296
- ui.info(cli_shared_1.Text.devSpace.selectionPrompt);
297
- ui.emptyLine();
298
- }
299
- const devSpaceResult = await devSpaceService.selectDevSpace(ui, devSpaces, 'register');
300
- if (!devSpaceResult) {
301
- return;
302
- }
303
- ui.emptyLine();
304
- isNewlyCreatedDevSpace = devSpaceResult.isNewlyCreated;
305
- devSpaceId = devSpaceResult.devSpace.id;
306
- if (!isNewlyCreatedDevSpace) {
307
- ui.info(cli_shared_1.Text.devSpace.assigningToSpace(devSpaceResult.devSpace.name));
308
- }
309
- ui.clearSpinner();
310
342
  ui.info(cli_shared_1.Text.register.intro);
311
343
  }
312
- if (!isDevSpaceSelectionEnabled) {
344
+ else {
313
345
  ui.info(cli_shared_1.Text.register.intro);
314
346
  ui.info(cli_shared_1.Text.ctrlC);
315
347
  ui.emptyLine();
@@ -319,20 +351,20 @@ function registerRegisterCommand({ cmd, ui, commands: { registerAppCommand }, se
319
351
  name = await ui.promptForText(cli_shared_1.Text.create.promptName);
320
352
  ui.emptyLine();
321
353
  }
322
- if (isDevSpaceSelectionEnabled) {
354
+ if (isDevSpaceSelectionEnabled && !devSpaceId) {
323
355
  await promptAndAcceptTerms(ui, name, isNewlyCreatedDevSpace || false);
324
356
  ui.info(cli_shared_1.Text.devSpace.terms.accepted('registration'));
325
357
  ui.emptyLine();
326
358
  }
327
- const executeArgs = { name, ...(devSpaceId && { developerSpaceId: devSpaceId }) };
359
+ const executeArgs = { name, ...(selectedDevSpace?.id && { developerSpaceId: selectedDevSpace?.id }) };
328
360
  const result = await ui.displayProgress(() => registerAppCommand.execute(executeArgs), cli_shared_1.Text.register.cmd.start, cli_shared_1.Text.register.cmd.success(name));
329
361
  ui.info(cli_shared_1.Text.register.cmd.successDetails(result.environments));
330
362
  return result;
331
363
  });
332
364
  }
333
- function registerCommands(deps) {
334
- registerCreateCommands(deps);
335
- registerRegisterCommand(deps);
365
+ async function registerCommands(deps) {
366
+ await registerCreateCommands(deps);
367
+ await registerRegisterCommand(deps);
336
368
  }
337
369
  exports.registerCommands = registerCommands;
338
370
  //# sourceMappingURL=register-app-commands.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"register-app-commands.js","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"register-app-commands.js","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,10 @@
1
- import { CredentialGetter, Logger, LoginCommand, PersonalApiCredentialsValidated, UI, UserRepository } from '@forge/cli-shared';
1
+ import { CredentialGetter, Logger, LoginCommand, UI, UserRepository } from '@forge/cli-shared';
2
2
  import { Dependencies } from './dependency-injection';
3
3
  export interface LoginCommandOptions {
4
4
  email?: string;
5
5
  token?: string;
6
6
  }
7
7
  export declare function loginCommandHandler(ui: UI, instructionsUrl: string, loginCommand: LoginCommand, { email, token }: LoginCommandOptions): Promise<{
8
- creds: PersonalApiCredentialsValidated;
9
8
  analytics: {
10
9
  userId: string;
11
10
  anonymousId: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,gBAAgB,EAEhB,MAAM,EACN,YAAY,EACZ,+BAA+B,EAE/B,EAAE,EAEF,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAqCrH;AA0BD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgBf;AASD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}
1
+ {"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,gBAAgB,EAEhB,MAAM,EACN,YAAY,EAEZ,EAAE,EAEF,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoC7E;AA0BD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgBf;AASD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}
@@ -33,7 +33,6 @@ async function loginCommandHandler(ui, instructionsUrl, loginCommand, { email, t
33
33
  ui.emptyLine();
34
34
  ui.info(cli_shared_1.Text.login.nextStep);
35
35
  return {
36
- creds: { email, token, accountId: user.accountId },
37
36
  analytics: { userId: user.accountId, anonymousId: (0, anon_user_id_1.getAnonId)(true) }
38
37
  };
39
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"register-authentication-command.js","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"register-authentication-command.js","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import { Dependencies } from './dependency-injection';
2
- export declare const registerCommands: ({ cmd, ui, controllers: { tunnelController } }: Dependencies) => void;
2
+ export declare const registerCommands: ({ cmd, controllers: { tunnelController } }: Dependencies) => void;
3
3
  //# sourceMappingURL=register-tunnel-commands.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAa/F,CAAC"}
1
+ {"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,+CAAgD,YAAY,KAAG,IAa3F,CAAC"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.registerCommands = void 0;
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
- const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
5
+ const registerCommands = ({ cmd, controllers: { tunnelController } }) => {
6
6
  cmd
7
7
  .command('tunnel')
8
8
  .requireAppId()
@@ -13,7 +13,7 @@ const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
13
13
  .option('-p,--debugStartingPort [debugStartingPort]', cli_shared_1.Text.tunnel.debuggerPort, cli_shared_1.defaultDebugStartingPort.toString())
14
14
  .option('-n, --no-verify', 'disable pre-tunnel checks')
15
15
  .action(async (options) => {
16
- await tunnelController.run(options, ui);
16
+ await tunnelController.run(options);
17
17
  });
18
18
  };
19
19
  exports.registerCommands = registerCommands;
@@ -1 +1 @@
1
- {"version":3,"file":"register-tunnel-commands.js","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyF;AAIlF,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAAQ,EAAE;IACrG,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,YAAY,EAAE;SACd,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC;SAC5B,iBAAiB,EAAE;SACnB,MAAM,CAAC,aAAa,EAAE,iBAAI,CAAC,MAAM,CAAC,cAAc,CAAC;SACjD,MAAM,CAAC,uDAAuD,EAAE,iBAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;SAC7F,MAAM,CAAC,4CAA4C,EAAE,iBAAI,CAAC,MAAM,CAAC,YAAY,EAAE,qCAAwB,CAAC,QAAQ,EAAE,CAAC;SACnH,MAAM,CAAC,iBAAiB,EAAE,2BAA2B,CAAC;SACtD,MAAM,CAAC,KAAK,EAAE,OAA6B,EAAE,EAAE;QAC9C,MAAM,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAbW,QAAA,gBAAgB,oBAa3B"}
1
+ {"version":3,"file":"register-tunnel-commands.js","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyF;AAIlF,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAAQ,EAAE;IACjG,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,YAAY,EAAE;SACd,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC;SAC5B,iBAAiB,EAAE;SACnB,MAAM,CAAC,aAAa,EAAE,iBAAI,CAAC,MAAM,CAAC,cAAc,CAAC;SACjD,MAAM,CAAC,uDAAuD,EAAE,iBAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;SAC7F,MAAM,CAAC,4CAA4C,EAAE,iBAAI,CAAC,MAAM,CAAC,YAAY,EAAE,qCAAwB,CAAC,QAAQ,EAAE,CAAC;SACnH,MAAM,CAAC,iBAAiB,EAAE,2BAA2B,CAAC;SACtD,MAAM,CAAC,KAAK,EAAE,OAA6B,EAAE,EAAE;QAC9C,MAAM,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAbW,QAAA,gBAAgB,oBAa3B"}
@@ -1,10 +1,8 @@
1
- import { PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
1
+ import { TunnelOptions, UserError } from '@forge/cli-shared';
2
2
  import { StartTunnelCommand, TunnelInteractor } from '@forge/tunnel';
3
- import { CachedConfigService } from './cached-config-service';
4
3
  import { ConfigFilePortFindingService } from './port-finding-service';
5
- import { TunnelAnalyticsService } from './tunnel-analytics-service';
6
4
  export declare type TunnelService = {
7
- run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
5
+ run(tunnelOptions: TunnelOptions): Promise<void>;
8
6
  };
9
7
  export declare class FunctionHandlersMustBeDefinedInDebugMode extends UserError {
10
8
  constructor();
@@ -15,19 +13,11 @@ export declare class DebugArgumentNameMismatch extends UserError {
15
13
  export declare class InvalidDebugStartingPortNumber extends UserError {
16
14
  constructor(port: string);
17
15
  }
18
- declare abstract class TunnelServiceBase implements TunnelService {
19
- protected readonly cachedConfigService: CachedConfigService;
20
- constructor(cachedConfigService: CachedConfigService);
21
- abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
22
- }
23
- export declare class InProcessTunnelService extends TunnelServiceBase {
24
- private readonly ui;
16
+ export declare class InProcessTunnelService implements TunnelService {
25
17
  private readonly startTunnelCommand;
26
18
  private readonly tunnelInteractor;
27
19
  private readonly configFilePortFindingService;
28
- private readonly analyticsService;
29
- constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService);
30
- run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
20
+ constructor(startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService);
21
+ run(tunnelOptions: TunnelOptions): Promise<void>;
31
22
  }
32
- export {};
33
23
  //# 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":"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
+ {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,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;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAa9D"}
@@ -21,47 +21,25 @@ class InvalidDebugStartingPortNumber extends cli_shared_1.UserError {
21
21
  }
22
22
  }
23
23
  exports.InvalidDebugStartingPortNumber = InvalidDebugStartingPortNumber;
24
- class TunnelServiceBase {
25
- cachedConfigService;
26
- constructor(cachedConfigService) {
27
- this.cachedConfigService = cachedConfigService;
28
- }
29
- }
30
- class InProcessTunnelService extends TunnelServiceBase {
31
- ui;
24
+ class InProcessTunnelService {
32
25
  startTunnelCommand;
33
26
  tunnelInteractor;
34
27
  configFilePortFindingService;
35
- analyticsService;
36
- constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService) {
37
- super(cachedConfigService);
38
- this.ui = ui;
28
+ constructor(startTunnelCommand, tunnelInteractor, configFilePortFindingService) {
39
29
  this.startTunnelCommand = startTunnelCommand;
40
30
  this.tunnelInteractor = tunnelInteractor;
41
31
  this.configFilePortFindingService = configFilePortFindingService;
42
- this.analyticsService = analyticsService;
43
32
  }
44
- async run(tunnelOptions, creds, debugEnabled, onError) {
45
- try {
46
- const resourcePortMap = await this.configFilePortFindingService.findPorts();
47
- const tunnel = await this.startTunnelCommand.execute({
48
- environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
49
- resourcePortMap,
50
- host: 'localhost'
51
- });
52
- const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
53
- const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
54
- await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
55
- }
56
- catch (e) {
57
- await this.analyticsService.reportTunnelFailure(creds, e.constructor.name, (0, cli_shared_1.getErrorAttributes)(e));
58
- if (onError) {
59
- await onError(e);
60
- }
61
- else {
62
- await (0, cli_shared_1.exitOnError)(this.ui, e);
63
- }
64
- }
33
+ async run(tunnelOptions) {
34
+ const resourcePortMap = await this.configFilePortFindingService.findPorts();
35
+ const tunnel = await this.startTunnelCommand.execute({
36
+ environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
37
+ resourcePortMap,
38
+ host: 'localhost'
39
+ });
40
+ const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
41
+ const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
42
+ await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
65
43
  }
66
44
  }
67
45
  exports.InProcessTunnelService = InProcessTunnelService;
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,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;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACnD,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACF;AApBD,wDAoBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.3.1-next.1-experimental-b695d2e",
3
+ "version": "12.4.0-next.10",
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,14 +18,14 @@
18
18
  "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
19
19
  },
20
20
  "dependencies": {
21
- "@forge/bundler": "6.1.3-next.1-experimental-b695d2e",
22
- "@forge/cli-shared": "8.3.1-next.1-experimental-b695d2e",
23
- "@forge/egress": "2.0.2",
24
- "@forge/lint": "5.10.2-next.1-experimental-b695d2e",
25
- "@forge/manifest": "10.2.2-next.1-experimental-b695d2e",
21
+ "@forge/bundler": "6.1.3-next.10",
22
+ "@forge/cli-shared": "8.4.0-next.8",
23
+ "@forge/egress": "2.0.3-next.0",
24
+ "@forge/lint": "5.10.2-next.10",
25
+ "@forge/manifest": "10.3.0-next.3",
26
26
  "@forge/i18n": "0.0.7",
27
- "@forge/runtime": "6.0.2",
28
- "@forge/tunnel": "6.0.4-next.1-experimental-b695d2e",
27
+ "@forge/runtime": "6.0.3-next.0",
28
+ "@forge/tunnel": "6.0.4-next.10",
29
29
  "@forge/util": "2.0.0",
30
30
  "@sentry/node": "7.106.0",
31
31
  "ajv": "^8.12.0",
@@ -1,11 +0,0 @@
1
- import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
2
- import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
3
- export declare class TunnelAnalyticsService {
4
- private readonly analyticsClientReporter;
5
- private readonly cliDetails;
6
- constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
7
- reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
8
- [key: string]: any;
9
- }): Promise<void>;
10
- }
11
- //# sourceMappingURL=tunnel-analytics-service.d.ts.map
@@ -1 +0,0 @@
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"}
@@ -1,28 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.TunnelAnalyticsService = void 0;
4
- const cli_shared_1 = require("@forge/cli-shared");
5
- class TunnelAnalyticsService {
6
- analyticsClientReporter;
7
- cliDetails;
8
- constructor(analyticsClientReporter, cliDetails) {
9
- this.analyticsClientReporter = analyticsClientReporter;
10
- this.cliDetails = cliDetails;
11
- }
12
- async reportTunnelFailure(creds, errorName, attributes) {
13
- attributes = {
14
- error: errorName,
15
- version: this.cliDetails?.version,
16
- latest: this.cliDetails?.latest,
17
- isLatest: (0, cli_shared_1.isLatestCLIVersion)(this.cliDetails),
18
- isCloudflareTunnel: true,
19
- ...attributes
20
- };
21
- if (attributes.isUserError === undefined) {
22
- attributes = { ...attributes, isUserError: false };
23
- }
24
- this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
25
- }
26
- }
27
- exports.TunnelAnalyticsService = TunnelAnalyticsService;
28
- //# sourceMappingURL=tunnel-analytics-service.js.map