@forge/cli 12.3.1-next.1-experimental-b4d61da → 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 (50) 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-deployment-commands.js +2 -2
  37. package/out/command-line/register-deployment-commands.js.map +1 -1
  38. package/out/command-line/register-tunnel-commands.d.ts +1 -1
  39. package/out/command-line/register-tunnel-commands.d.ts.map +1 -1
  40. package/out/command-line/register-tunnel-commands.js +2 -2
  41. package/out/command-line/register-tunnel-commands.js.map +1 -1
  42. package/out/service/tunnel-service.d.ts +5 -15
  43. package/out/service/tunnel-service.d.ts.map +1 -1
  44. package/out/service/tunnel-service.js +12 -34
  45. package/out/service/tunnel-service.js.map +1 -1
  46. package/package.json +8 -8
  47. package/out/service/tunnel-analytics-service.d.ts +0 -11
  48. package/out/service/tunnel-analytics-service.d.ts.map +0 -1
  49. package/out/service/tunnel-analytics-service.js +0 -28
  50. package/out/service/tunnel-analytics-service.js.map +0 -1
package/CHANGELOG.md CHANGED
@@ -1,6 +1,61 @@
1
1
  # @forge/cli
2
2
 
3
- ## 12.3.1-next.1-experimental-b4d61da
3
+ ## 12.4.0-next.10
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [8a3d993]
8
+ - @forge/egress@2.0.3-next.0
9
+ - @forge/lint@5.10.2-next.10
10
+ - @forge/bundler@6.1.3-next.10
11
+ - @forge/tunnel@6.0.4-next.10
12
+
13
+ ## 12.4.0-next.9
14
+
15
+ ### Minor Changes
16
+
17
+ - b40750e: Update forge create to include Dashboards EAP option publicly
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies [b40750e]
22
+ - Updated dependencies [0db59f9]
23
+ - @forge/cli-shared@8.4.0-next.8
24
+ - @forge/manifest@10.3.0-next.3
25
+ - @forge/bundler@6.1.3-next.9
26
+ - @forge/lint@5.10.2-next.9
27
+ - @forge/tunnel@6.0.4-next.9
28
+
29
+ ## 12.4.0-next.8
30
+
31
+ ### Patch Changes
32
+
33
+ - 268551f: Simplify tunnel classes and analytics
34
+ - Updated dependencies [268551f]
35
+ - @forge/cli-shared@8.4.0-next.7
36
+ - @forge/bundler@6.1.3-next.8
37
+ - @forge/lint@5.10.2-next.8
38
+ - @forge/tunnel@6.0.4-next.8
39
+
40
+ ## 12.4.0-next.7
41
+
42
+ ### Patch Changes
43
+
44
+ - @forge/lint@5.10.2-next.7
45
+ - @forge/tunnel@6.0.4-next.7
46
+ - @forge/bundler@6.1.3-next.7
47
+
48
+ ## 12.4.0-next.6
49
+
50
+ ### Patch Changes
51
+
52
+ - Updated dependencies [84dcafe]
53
+ - @forge/cli-shared@8.4.0-next.6
54
+ - @forge/bundler@6.1.3-next.6
55
+ - @forge/lint@5.10.2-next.6
56
+ - @forge/tunnel@6.0.4-next.6
57
+
58
+ ## 12.4.0-next.5
4
59
 
5
60
  ### Minor Changes
6
61
 
@@ -8,17 +63,49 @@
8
63
 
9
64
  ### Patch Changes
10
65
 
11
- - 3c59dd2: Improve error message when Forge container creation fails
12
- - Updated dependencies [bc8e0c5]
13
- - Updated dependencies [8ba142a]
14
66
  - Updated dependencies [b003963]
67
+ - @forge/cli-shared@8.4.0-next.5
68
+ - @forge/bundler@6.1.3-next.5
69
+ - @forge/lint@5.10.2-next.5
70
+ - @forge/tunnel@6.0.4-next.5
71
+
72
+ ## 12.4.0-next.4
73
+
74
+ ### Minor Changes
75
+
76
+ - d273489: Add support for CI mode with devSpace in register and create command
77
+
78
+ ### Patch Changes
79
+
80
+ - Updated dependencies [d273489]
81
+ - @forge/cli-shared@8.3.1-next.4
82
+ - @forge/bundler@6.1.3-next.4
83
+ - @forge/lint@5.10.2-next.4
84
+ - @forge/tunnel@6.0.4-next.4
85
+
86
+ ## 12.3.1-next.3
87
+
88
+ ### Patch Changes
89
+
90
+ - Updated dependencies [d77aea3]
91
+ - @forge/cli-shared@8.3.1-next.3
92
+ - @forge/bundler@6.1.3-next.3
93
+ - @forge/lint@5.10.2-next.3
94
+ - @forge/tunnel@6.0.4-next.3
95
+
96
+ ## 12.3.1-next.2
97
+
98
+ ### Patch Changes
99
+
100
+ - Updated dependencies [bc8e0c5]
101
+ - Updated dependencies [7a8de48]
15
102
  - Updated dependencies [86dbde7]
16
- - Updated dependencies [a614f0b]
17
- - @forge/tunnel@6.0.4-next.1-experimental-b4d61da
18
- - @forge/manifest@10.2.2-next.1-experimental-b4d61da
19
- - @forge/cli-shared@8.3.1-next.1-experimental-b4d61da
20
- - @forge/bundler@6.1.3-next.1-experimental-b4d61da
21
- - @forge/lint@5.10.2-next.1-experimental-b4d61da
103
+ - @forge/tunnel@6.0.4-next.2
104
+ - @forge/runtime@6.0.3-next.0
105
+ - @forge/manifest@10.2.2-next.2
106
+ - @forge/bundler@6.1.3-next.2
107
+ - @forge/lint@5.10.2-next.2
108
+ - @forge/cli-shared@8.3.1-next.2
22
109
 
23
110
  ## 12.3.1-next.1
24
111
 
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.3.1-next.1-experimental-b4d61da",
3
+ "version": "12.4.0-next.10",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "12.3.1-next.1-experimental-b4d61da",
9
+ "version": "12.4.0-next.10",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "6.1.3-next.1-experimental-b4d61da",
14
- "@forge/cli-shared": "8.3.1-next.1-experimental-b4d61da",
15
- "@forge/egress": "2.0.2",
13
+ "@forge/bundler": "6.1.3-next.10",
14
+ "@forge/cli-shared": "8.4.0-next.8",
15
+ "@forge/egress": "2.0.3-next.0",
16
16
  "@forge/i18n": "0.0.7",
17
- "@forge/lint": "5.10.2-next.1-experimental-b4d61da",
18
- "@forge/manifest": "10.2.2-next.1-experimental-b4d61da",
19
- "@forge/runtime": "6.0.2",
20
- "@forge/tunnel": "6.0.4-next.1-experimental-b4d61da",
17
+ "@forge/lint": "5.10.2-next.10",
18
+ "@forge/manifest": "10.3.0-next.3",
19
+ "@forge/runtime": "6.0.3-next.0",
20
+ "@forge/tunnel": "6.0.4-next.10",
21
21
  "@forge/util": "2.0.0",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.12.0",
@@ -546,9 +546,9 @@
546
546
  }
547
547
  },
548
548
  "node_modules/@forge/bundler": {
549
- "version": "6.1.3-next.1-experimental-b4d61da",
550
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.3-next.1-experimental-b4d61da.tgz",
551
- "integrity": "sha512-1XC4Gm30FNoXtjWlPj1xOrxq3+TipdrCYgl/0Yfr0UXBYGJBYyqNuWW4Nb2uCpnlMjDqy82gPUbXrpnAVooD/w==",
549
+ "version": "6.1.3-next.10",
550
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-6.1.3-next.10.tgz",
551
+ "integrity": "sha512-3pi+6Ua9xufbs7VI5fjBxgTbGsU8F8EhtmM1X3sY0ounuB28qou+4gFB20CimTRwFON9d8OZQe8jsCfCzg5iYQ==",
552
552
  "license": "SEE LICENSE IN LICENSE.txt",
553
553
  "dependencies": {
554
554
  "@babel/core": "^7.24.0",
@@ -557,10 +557,10 @@
557
557
  "@babel/plugin-transform-numeric-separator": "^7.23.4",
558
558
  "@babel/plugin-transform-optional-chaining": "^7.23.4",
559
559
  "@babel/plugin-transform-react-jsx": "^7.23.4",
560
- "@forge/cli-shared": "8.3.1-next.1-experimental-b4d61da",
560
+ "@forge/cli-shared": "8.4.0-next.8",
561
561
  "@forge/i18n": "0.0.7",
562
- "@forge/lint": "5.10.2-next.1-experimental-b4d61da",
563
- "@forge/manifest": "10.2.2-next.1-experimental-b4d61da",
562
+ "@forge/lint": "5.10.2-next.10",
563
+ "@forge/manifest": "10.3.0-next.3",
564
564
  "babel-loader": "^8.3.0",
565
565
  "cheerio": "^1.1.0",
566
566
  "cross-spawn": "^7.0.6",
@@ -579,13 +579,13 @@
579
579
  }
580
580
  },
581
581
  "node_modules/@forge/cli-shared": {
582
- "version": "8.3.1-next.1-experimental-b4d61da",
583
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.3.1-next.1-experimental-b4d61da.tgz",
584
- "integrity": "sha512-eAsvPlFxm4kh2cJN3WeL5S959JAuGvdU2pHJeYcf1ZVehxwK8KRjqi/iwRtbzgBUhd3CqpEagpshTAbdE3qARw==",
582
+ "version": "8.4.0-next.8",
583
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-8.4.0-next.8.tgz",
584
+ "integrity": "sha512-5gtud+Bi2M8qWiDqSXeU98RGPsPbssvL0liGczFGgOq9u8E5ViYKae1o8K3SU/6juk772ItqFtrIUKMWFfcpuA==",
585
585
  "license": "SEE LICENSE IN LICENSE.txt",
586
586
  "dependencies": {
587
587
  "@forge/i18n": "0.0.7",
588
- "@forge/manifest": "10.2.2-next.1-experimental-b4d61da",
588
+ "@forge/manifest": "10.3.0-next.3",
589
589
  "@forge/util": "2.0.0",
590
590
  "@sentry/node": "7.106.0",
591
591
  "adm-zip": "^0.5.10",
@@ -618,12 +618,12 @@
618
618
  }
619
619
  },
620
620
  "node_modules/@forge/csp": {
621
- "version": "4.2.1-experimental-b4d61da",
622
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-4.2.1-experimental-b4d61da.tgz",
623
- "integrity": "sha512-FYOVsjSoPaYzMFft1H0J0nCfcgffDzF3+TQmQnWfJQUXKJL/2EeE0ORQkrgokqAEx0K8HGYauG4sIpjcG9T/kQ==",
621
+ "version": "5.0.0-next.1",
622
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-5.0.0-next.1.tgz",
623
+ "integrity": "sha512-ioZNXRSGNGOHkIdSRvcnhr3IX/s7jrSPHsHAOmyadeFUk/gid2/J9fmVlz91KWrFiUbF1G9P3AW/lRGywVU20A==",
624
624
  "license": "SEE LICENSE IN LICENSE.txt",
625
625
  "dependencies": {
626
- "content-security-policy-parser": "^0.4.1"
626
+ "content-security-policy-parser": "^0.5.0"
627
627
  },
628
628
  "peerDependencies": {
629
629
  "cheerio": "^1.1.0"
@@ -635,9 +635,9 @@
635
635
  }
636
636
  },
637
637
  "node_modules/@forge/egress": {
638
- "version": "2.0.2",
639
- "resolved": "https://registry.npmjs.org/@forge/egress/-/egress-2.0.2.tgz",
640
- "integrity": "sha512-EiSOkveXOxjmsIldaNjcYTuAwMKYV6u8MQlLN1RBcYk33KO0Owb6E2cce7byY7NgeVmQr/wABqoIjsnZNannYw==",
638
+ "version": "2.0.3-next.0",
639
+ "resolved": "https://registry.npmjs.org/@forge/egress/-/egress-2.0.3-next.0.tgz",
640
+ "integrity": "sha512-krUBbe/wgXeaF4KkNhxC7Heh/0eHRXdkHwi8NoDkkF9rVRbHZtkwP35JNoEunI4jOIhgtahiqSPxUg+SfXe1CA==",
641
641
  "license": "SEE LICENSE IN LICENSE.txt",
642
642
  "dependencies": {
643
643
  "minimatch": "^9.0.5"
@@ -653,16 +653,16 @@
653
653
  }
654
654
  },
655
655
  "node_modules/@forge/lint": {
656
- "version": "5.10.2-next.1-experimental-b4d61da",
657
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.10.2-next.1-experimental-b4d61da.tgz",
658
- "integrity": "sha512-guGyzUAthkHVVpXnc1ITOg/UJa8iZeFtBn0TsUb/zFEMKVb7/juYpGBUXoOVO223hjiyPOotBf2GsZGu2K3niw==",
656
+ "version": "5.10.2-next.10",
657
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-5.10.2-next.10.tgz",
658
+ "integrity": "sha512-9KaUEY5IC3cJzSFdKSdOJKquPA0s9C/7dPW9iGuItc2GD0Ae58tIvM6lYAaMGJNu4wZD4B2ZT68Eaxq1jBUaZw==",
659
659
  "license": "SEE LICENSE IN LICENSE.txt",
660
660
  "dependencies": {
661
661
  "@atlassian/atlassian-openapi": "^1.0.6",
662
- "@forge/cli-shared": "8.3.1-next.1-experimental-b4d61da",
663
- "@forge/csp": "4.2.1-experimental-b4d61da",
664
- "@forge/egress": "2.0.2",
665
- "@forge/manifest": "10.2.2-next.1-experimental-b4d61da",
662
+ "@forge/cli-shared": "8.4.0-next.8",
663
+ "@forge/csp": "5.0.0-next.1",
664
+ "@forge/egress": "2.0.3-next.0",
665
+ "@forge/manifest": "10.3.0-next.3",
666
666
  "@typescript-eslint/typescript-estree": "^5.62.0",
667
667
  "array.prototype.flatmap": "^1.3.3",
668
668
  "cross-spawn": "^7.0.6",
@@ -670,9 +670,9 @@
670
670
  }
671
671
  },
672
672
  "node_modules/@forge/manifest": {
673
- "version": "10.2.2-next.1-experimental-b4d61da",
674
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-10.2.2-next.1-experimental-b4d61da.tgz",
675
- "integrity": "sha512-1qMDIfMRc7RRhFg231iv9WhrUsEjcNTfDQWR+rNQdaJyk+jAke2vorOwOddfku4D7hAkFmFUgNrevAd1ai5IBQ==",
673
+ "version": "10.3.0-next.3",
674
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-10.3.0-next.3.tgz",
675
+ "integrity": "sha512-hbRhq8pohuQ5AjBTTXrb0OvJg6n778O9ltli1yqCoR1T8HwrLbz41u67Wz8BleUGrO0d1EhLWodnh8PjYOnmIQ==",
676
676
  "license": "SEE LICENSE IN LICENSE.txt",
677
677
  "dependencies": {
678
678
  "@forge/i18n": "0.0.7",
@@ -687,21 +687,21 @@
687
687
  }
688
688
  },
689
689
  "node_modules/@forge/runtime": {
690
- "version": "6.0.2",
691
- "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.0.2.tgz",
692
- "integrity": "sha512-dP85JR3k/qZOedcbyepwrr6C3G9Xn4dwfQExXtlDxboRhA98TZnh7e1ZvSQrc0K3nt8drWRrxTGLhW2p2SBAbg==",
690
+ "version": "6.0.3-next.0",
691
+ "resolved": "https://registry.npmjs.org/@forge/runtime/-/runtime-6.0.3-next.0.tgz",
692
+ "integrity": "sha512-vfo6qVCU8peTvidn+nEjLbWv9Mdm9q4IXJFKrVO/qJ+CbxMGrxzoVuCmxMocDol7R3lxs3xNrP2RgoEZivcckg==",
693
693
  "license": "SEE LICENSE IN LICENSE.txt"
694
694
  },
695
695
  "node_modules/@forge/tunnel": {
696
- "version": "6.0.4-next.1-experimental-b4d61da",
697
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.0.4-next.1-experimental-b4d61da.tgz",
698
- "integrity": "sha512-TjlExSqwszRz+gmnp6XPQ7a82fdUIEZ7nH8V8PV4Je+pyL8C6hFx+JU+Df2nRsJn4grd70epQVekPSm/q4LMxg==",
696
+ "version": "6.0.4-next.10",
697
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-6.0.4-next.10.tgz",
698
+ "integrity": "sha512-9e635XQFpzlDpXBNjjafDqjfSSeg9XH2pD8fo7ZRgdsS/2q0FtjJfvPP963P3GBc2ARt/x6JSTlg7u2hu9934Q==",
699
699
  "license": "SEE LICENSE IN LICENSE.txt",
700
700
  "dependencies": {
701
- "@forge/bundler": "6.1.3-next.1-experimental-b4d61da",
702
- "@forge/cli-shared": "8.3.1-next.1-experimental-b4d61da",
703
- "@forge/csp": "4.2.1-experimental-b4d61da",
704
- "@forge/runtime": "6.0.2",
701
+ "@forge/bundler": "6.1.3-next.10",
702
+ "@forge/cli-shared": "8.4.0-next.8",
703
+ "@forge/csp": "5.0.0-next.1",
704
+ "@forge/runtime": "6.0.3-next.0",
705
705
  "cheerio": "^1.1.0",
706
706
  "chokidar": "^3.6.0",
707
707
  "cloudflared": "^0.7.0",
@@ -748,9 +748,9 @@
748
748
  }
749
749
  },
750
750
  "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
751
- "version": "6.1.0",
752
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
753
- "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
751
+ "version": "6.2.0",
752
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
753
+ "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
754
754
  "license": "MIT",
755
755
  "engines": {
756
756
  "node": ">=12"
@@ -2774,11 +2774,11 @@
2774
2774
  }
2775
2775
  },
2776
2776
  "node_modules/content-security-policy-parser": {
2777
- "version": "0.4.1",
2778
- "resolved": "https://registry.npmjs.org/content-security-policy-parser/-/content-security-policy-parser-0.4.1.tgz",
2779
- "integrity": "sha1-J7UHZJsbdbx18XnfkZGahp7hFrU= sha512-NNJS8XPnx3OKr/CUOSwDSJw+lWTrZMYnclLKj0Y9CYOfJNJTWLFGPg3u2hYgbXMXKVRkZR2fbyReNQ1mUff/Qg==",
2777
+ "version": "0.5.0",
2778
+ "resolved": "https://registry.npmjs.org/content-security-policy-parser/-/content-security-policy-parser-0.5.0.tgz",
2779
+ "integrity": "sha1-koAZUFkID6eIxR+EaapHJfKO/vc= sha512-ozWQUpVaL33crxwh0lN5MMoBbrpeiaRDw/Fx4oW5wd7aDZughPe5YkzT9NCez7lrVoWyjSmj++ewnuVVgHDEJA==",
2780
2780
  "engines": {
2781
- "node": ">=8.0.0"
2781
+ "node": ">=18.0.0"
2782
2782
  }
2783
2783
  },
2784
2784
  "node_modules/content-type": {
@@ -1,25 +1,26 @@
1
- import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
2
- import { Storage } from '../storage/local-file-storage';
1
+ import { CredentialGetter } from '@forge/cli-shared';
3
2
  import { CachedConfigService } from '../service/cached-config-service';
3
+ import { Storage } from '../storage/local-file-storage';
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
8
  private readonly configService;
9
- constructor(storage: Storage, configService: CachedConfigService);
9
+ private readonly credentialStore;
10
+ constructor(storage: Storage, configService: CachedConfigService, credentialStore: CredentialGetter);
10
11
  private readonly source;
11
- reportSuccess(cmdName: string, cred: PersonalApiCredentialsValidated | string, attributes: {
12
+ reportSuccess(cmdName: string, attributes: {
12
13
  [key: string]: any;
13
- }): void;
14
- reportFailure(cmdName: string, cred: string | PersonalApiCredentialsValidated, attributes: {
14
+ }): Promise<void>;
15
+ reportFailure(cmdName: string, attributes: {
15
16
  [key: string]: any;
16
- }, e: Error): void;
17
- reportCommandInvoke(cmdName: string, cred: string | PersonalApiCredentialsValidated, attributes: {
17
+ }, e: Error): Promise<void>;
18
+ reportCommandInvoke(cmdName: string, attributes: {
18
19
  [key: string]: any;
19
- }): void;
20
- reportInvokeFailure(cmdName: string, cred: string | PersonalApiCredentialsValidated, attributes: {
20
+ }): Promise<void>;
21
+ reportInvokeFailure(cmdName: string, attributes: {
21
22
  [key: string]: any;
22
- }, e?: Error | DeferredErrors): void;
23
+ }, e?: Error | DeferredErrors): Promise<void>;
23
24
  private reportOperationalEvent;
24
25
  private processAnalyticsEvent;
25
26
  private _getUserId;
@@ -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,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"}
1
+ {"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAwB,MAAM,mBAAmB,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIxD,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;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAFf,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,gBAAgB;IAGpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAEjC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBjF,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3F,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvF,mBAAmB,CAC9B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,CAAC,EAAE,KAAK,GAAG,cAAc,GACzB,OAAO,CAAC,IAAI,CAAC;YAQF,sBAAsB;IA4BpC,OAAO,CAAC,qBAAqB;YAOf,UAAU;IAcxB,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"}
@@ -2,15 +2,16 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AnalyticsClientReporter = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const analytics_node_client_1 = require("@forge/util/packages/analytics-node-client");
6
5
  const os = tslib_1.__importStar(require("os"));
7
- const ari_1 = require("@forge/util/packages/ari");
8
- const analytics_message_handler_1 = require("./analytics-message-handler");
6
+ const url_1 = require("url");
9
7
  const uuid_1 = require("uuid");
8
+ const analytics_node_client_1 = require("@forge/util/packages/analytics-node-client");
9
+ const ari_1 = require("@forge/util/packages/ari");
10
10
  const cli_shared_1 = require("@forge/cli-shared");
11
- const unique_machine_id_1 = require("../command-line/unique-machine-id");
11
+ const anon_user_id_1 = require("../command-line/anon-user-id");
12
12
  const errors_1 = require("../command-line/errors");
13
- const url_1 = require("url");
13
+ const unique_machine_id_1 = require("../command-line/unique-machine-id");
14
+ const analytics_message_handler_1 = require("./analytics-message-handler");
14
15
  const Identity = (value) => value;
15
16
  function appAidOrUndefined(appAri) {
16
17
  try {
@@ -23,12 +24,14 @@ function appAidOrUndefined(appAri) {
23
24
  class AnalyticsClientReporter {
24
25
  storage;
25
26
  configService;
26
- constructor(storage, configService) {
27
+ credentialStore;
28
+ constructor(storage, configService, credentialStore) {
27
29
  this.storage = storage;
28
30
  this.configService = configService;
31
+ this.credentialStore = credentialStore;
29
32
  }
30
33
  source = 'forge/cli';
31
- reportSuccess(cmdName, cred, attributes) {
34
+ async reportSuccess(cmdName, attributes) {
32
35
  this.processAnalyticsEvent({
33
36
  id: (0, uuid_1.v4)(),
34
37
  eventType: analytics_message_handler_1.EventType.TRACK,
@@ -38,7 +41,7 @@ class AnalyticsClientReporter {
38
41
  name: os.platform(),
39
42
  version: os.release()
40
43
  },
41
- ...this._getUserId(cred),
44
+ ...(await this._getUserId()),
42
45
  trackEvent: {
43
46
  source: this.source,
44
47
  action: 'invoked',
@@ -49,23 +52,23 @@ class AnalyticsClientReporter {
49
52
  }
50
53
  });
51
54
  }
52
- reportFailure(cmdName, cred, attributes, e) {
55
+ async reportFailure(cmdName, attributes, e) {
53
56
  attributes = {
54
57
  ...attributes,
55
58
  ...this._getErrorDetails(e)
56
59
  };
57
- this.reportOperationalEvent('invoked', cmdName, cred, attributes);
60
+ await this.reportOperationalEvent('invoked', cmdName, attributes);
58
61
  }
59
- reportCommandInvoke(cmdName, cred, attributes) {
60
- this.reportOperationalEvent('cmdInvoked', cmdName, cred, attributes);
62
+ async reportCommandInvoke(cmdName, attributes) {
63
+ await this.reportOperationalEvent('cmdInvoked', cmdName, attributes);
61
64
  }
62
- reportInvokeFailure(cmdName, cred, attributes, e) {
65
+ async reportInvokeFailure(cmdName, attributes, e) {
63
66
  if (e) {
64
67
  attributes = { ...attributes, ...this._getErrorListDetails(e) };
65
68
  }
66
- this.reportOperationalEvent('cmdInvokeFailed', cmdName, cred, attributes);
69
+ await this.reportOperationalEvent('cmdInvokeFailed', cmdName, attributes);
67
70
  }
68
- reportOperationalEvent(action, actionSubject, cred, attributes) {
71
+ async reportOperationalEvent(action, actionSubject, attributes) {
69
72
  this.processAnalyticsEvent({
70
73
  id: (0, uuid_1.v4)(),
71
74
  eventType: analytics_message_handler_1.EventType.OPERATIONAL,
@@ -75,7 +78,7 @@ class AnalyticsClientReporter {
75
78
  name: os.platform(),
76
79
  version: os.release()
77
80
  },
78
- ...this._getUserId(cred),
81
+ ...(await this._getUserId()),
79
82
  operationalEvent: {
80
83
  source: this.source,
81
84
  action,
@@ -94,15 +97,19 @@ class AnalyticsClientReporter {
94
97
  }
95
98
  this.storage.addAnalyticsEvent(analyticsEvent);
96
99
  }
97
- _getUserId(cred) {
98
- return typeof cred === 'string'
99
- ? {
100
- anonymousId: cred
101
- }
102
- : {
100
+ async _getUserId() {
101
+ try {
102
+ const { accountId: userId } = await this.credentialStore.getCredentials();
103
+ return {
103
104
  userIdType: analytics_node_client_1.userTypes.ATLASSIAN_ACCOUNT,
104
- userId: cred.accountId
105
+ userId
105
106
  };
107
+ }
108
+ catch {
109
+ return {
110
+ anonymousId: (0, anon_user_id_1.getAnonId)()
111
+ };
112
+ }
106
113
  }
107
114
  _getErrorDetails(e) {
108
115
  if (e instanceof cli_shared_1.GraphQlMutationError) {
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-client.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":";;;;AAAA,sFAAqG;AACrG,+CAAyB;AAEzB,kDAA2D;AAC3D,2EAA0E;AAC1E,+BAAkC;AAElC,kDAAyD;AACzD,yEAAiE;AAEjE,mDAAwD;AACxD,6BAA0B;AAG1B,MAAM,QAAQ,GAAyB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;AAExD,SAAS,iBAAiB,CAAC,MAAc;IACvC,IAAI;QACF,OAAO,qBAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;KAC5C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,MAAa,uBAAuB;IAEf;IACA;IAFnB,YACmB,OAAgB,EAChB,aAAkC;QADlC,YAAO,GAAP,OAAO,CAAS;QAChB,kBAAa,GAAb,aAAa,CAAqB;IAClD,CAAC;IAEa,MAAM,GAAW,WAAW,CAAC;IAEvC,aAAa,CAClB,OAAe,EACf,IAA8C,EAC9C,UAAkC;QAElC,IAAI,CAAC,qBAAqB,CAAC;YACzB,EAAE,EAAE,IAAA,SAAI,GAAE;YACV,SAAS,EAAE,qCAAS,CAAC,KAAK;YAC1B,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,EAAE,EAAE;oBACF,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;oBACnB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;iBACtB;gBACD,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxB,UAAU,EAAE;oBACV,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE,SAAS;oBACjB,aAAa,EAAE,OAAO;oBACtB,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;oBAC3C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;iBAC3C;aACY;SAChB,CAAC,CAAC;IACL,CAAC;IAEM,aAAa,CAClB,OAAe,EACf,IAA8C,EAC9C,UAAkC,EAClC,CAAQ;QAER,UAAU,GAAG;YACX,GAAG,UAAU;YACb,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC5B,CAAC;QACF,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IACpE,CAAC;IAEM,mBAAmB,CACxB,OAAe,EACf,IAA8C,EAC9C,UAAkC;QAElC,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;IAEM,mBAAmB,CACxB,OAAe,EACf,IAA8C,EAC9C,UAAkC,EAClC,CAA0B;QAE1B,IAAI,CAAC,EAAE;YACL,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE;QAED,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAC5E,CAAC;IAEO,sBAAsB,CAC5B,MAAc,EACd,aAAqB,EACrB,IAA8C,EAC9C,UAAkC;QAElC,IAAI,CAAC,qBAAqB,CAAC;YACzB,EAAE,EAAE,IAAA,SAAI,GAAE;YACV,SAAS,EAAE,qCAAS,CAAC,WAAW;YAChC,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,EAAE,EAAE;oBACF,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE;oBACnB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;iBACtB;gBACD,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxB,gBAAgB,EAAE;oBAChB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM;oBACN,aAAa;oBACb,UAAU,EAAE;wBACV,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;qBACnC;oBACD,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;iBAC3C;aACkB;SACtB,CAAC,CAAC;IACL,CAAC;IAEO,qBAAqB,CAAC,cAAgC;QAC5D,IAAI,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,KAAK,KAAK,EAAE;YAC1D,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAEO,UAAU,CAAC,IAA8C;QAC/D,OAAO,OAAO,IAAI,KAAK,QAAQ;YAC7B,CAAC,CAAC;gBACE,WAAW,EAAE,IAAI;aAClB;YACH,CAAC,CAAC;gBACE,UAAU,EAAE,iCAAS,CAAC,iBAAiB;gBACvC,MAAM,EAAE,IAAI,CAAC,SAAS;aACvB,CAAC;IACR,CAAC;IAEO,gBAAgB,CAAC,CAAQ;QAC/B,IAAI,CAAC,YAAY,iCAAoB,EAAE;YACrC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;SAC/B;QACD,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;IAEO,oBAAoB,CAAC,CAAyB;QACpD,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,CAAC,YAAY,uBAAc,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,KAAK,YAAY,iCAAoB,EAAE;gBACzC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACjC;iBAAM;gBACL,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,CAAC;IAEO,YAAY,CAAI,SAAY,EAAE,aAAqB,EAAE,IAAY,EAAE,SAA6B,QAAQ;QAC9G,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,OAAO,WAAW;YAChB,CAAC,CAAC;gBACE,CAAC,aAAa,CAAC,EAAE;oBACf,EAAE,EAAE,WAAW;oBACf,IAAI;iBACL;aACF;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAEO,YAAY;QAClB,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAEO,UAAU;QAChB,OAAO,EAAE,SAAS,EAAE,IAAA,gCAAY,GAAE,EAAE,CAAC;IACvC,CAAC;IAEO,YAAY,CAAI,SAAY,EAAE,IAAY,EAAE,SAA6B,QAAQ;QACvF,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC;IAEO,cAAc,CAAC,UAAe;QACpC,OAAO;YACL,GAAG,UAAU;YACb,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,iBAAiB,CAAC;YAClE,GAAG,IAAI,CAAC,YAAY,EAAE;YACtB,GAAG,IAAI,CAAC,UAAU,EAAE;SACrB,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,UAAkC;QACtD,OAAO;YACL,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,CAAC;YACzE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC;YAChE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC;SAC/D,CAAC;IACJ,CAAC;IACM,MAAM,CAAC,WAAW,CAAC,KAAU;QAClC,OAAO,KAAK,YAAY,SAAG;YACzB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvB,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;gBACzB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK,KAAK,SAAS;oBACnB,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF;AA1LD,0DA0LC"}
1
+ {"version":3,"file":"analytics-client.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"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"}
@@ -4,18 +4,26 @@ export declare enum EventType {
4
4
  OPERATIONAL = "operational",
5
5
  UI = "ui"
6
6
  }
7
- export interface AnalyticsMessage {
7
+ export declare type AnalyticsMessage = {
8
+ eventType: EventType.TRACK;
9
+ event: TrackEvent;
8
10
  id: string;
9
- eventType: EventType;
10
- event: UIEvent | TrackEvent | OperationalEvent;
11
- }
11
+ } | {
12
+ eventType: EventType.OPERATIONAL;
13
+ event: OperationalEvent;
14
+ id: string;
15
+ } | {
16
+ eventType: EventType.UI;
17
+ event: UIEvent;
18
+ id: string;
19
+ };
12
20
  export interface MessageHandler<T> {
13
21
  handleMessage(message: T): Promise<void>;
14
22
  }
15
23
  export declare class AnalyticsMessageHandler implements MessageHandler<AnalyticsMessage> {
16
24
  private readonly environment?;
17
- constructor(environment?: string | undefined);
18
25
  private readonly aClient;
26
+ constructor(environment?: string | undefined);
19
27
  handleMessage: (message: AnalyticsMessage | undefined) => Promise<void>;
20
28
  }
21
29
  //# sourceMappingURL=analytics-message-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-message-handler.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-message-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,EAChB,UAAU,EACV,OAAO,EACR,MAAM,4CAA4C,CAAC;AAEpD,oBAAY,SAAS;IACnB,KAAK,UAAU;IACf,WAAW,gBAAgB;IAC3B,EAAE,OAAO;CACV;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,OAAO,GAAG,UAAU,GAAG,gBAAgB,CAAC;CAChD;AAED,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,aAAa,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,qBAAa,uBAAwB,YAAW,cAAc,CAAC,gBAAgB,CAAC;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAAZ,WAAW,CAAC,oBAAQ;IAEjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAMrB;IAOI,aAAa,YAAmB,gBAAgB,GAAG,SAAS,KAAG,QAAQ,IAAI,CAAC,CAmBjF;CACH"}
1
+ {"version":3,"file":"analytics-message-handler.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-message-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,gBAAgB,EAChB,UAAU,EACV,OAAO,EACR,MAAM,4CAA4C,CAAC;AAEpD,oBAAY,SAAS;IACnB,KAAK,UAAU;IACf,WAAW,gBAAgB;IAC3B,EAAE,OAAO;CACV;AAED,oBAAY,gBAAgB,GACxB;IAAE,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC7D;IAAE,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5D,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,aAAa,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,qBAAa,uBAAwB,YAAW,cAAc,CAAC,gBAAgB,CAAC;IAGlE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAFzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAEb,WAAW,CAAC,oBAAQ;IAe1C,aAAa,YAAmB,gBAAgB,GAAG,SAAS,KAAG,QAAQ,IAAI,CAAC,CAmBjF;CACH"}
@@ -10,16 +10,17 @@ var EventType;
10
10
  })(EventType = exports.EventType || (exports.EventType = {}));
11
11
  class AnalyticsMessageHandler {
12
12
  environment;
13
+ aClient;
13
14
  constructor(environment) {
14
15
  this.environment = environment;
16
+ this.aClient = (0, analytics_node_client_1.analyticsClient)({
17
+ env: this.environment || 'prod',
18
+ product: 'forge',
19
+ subproduct: 'cli',
20
+ flushAt: 1,
21
+ flushInterval: 1
22
+ });
15
23
  }
16
- aClient = (0, analytics_node_client_1.analyticsClient)({
17
- env: this.environment || 'prod',
18
- product: 'forge',
19
- subproduct: 'cli',
20
- flushAt: 1,
21
- flushInterval: 1
22
- });
23
24
  handleMessage = async (message) => {
24
25
  if (!message) {
25
26
  return;
@@ -1 +1 @@
1
- {"version":3,"file":"analytics-message-handler.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-message-handler.ts"],"names":[],"mappings":";;;AAAA,sFAMoD;AAEpD,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,wCAA2B,CAAA;IAC3B,sBAAS,CAAA;AACX,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AAYD,MAAa,uBAAuB;IACL;IAA7B,YAA6B,WAAoB;QAApB,gBAAW,GAAX,WAAW,CAAS;IAAG,CAAC;IAEpC,OAAO,GAAoB,IAAA,uCAAe,EAAC;QAC1D,GAAG,EAAE,IAAI,CAAC,WAAW,IAAI,MAAM;QAC/B,OAAO,EAAE,OAAO;QAChB,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,CAAC;QACV,aAAa,EAAE,CAAC;KACjB,CAAC,CAAC;IAOI,aAAa,GAAG,KAAK,EAAE,OAAqC,EAAiB,EAAE;QACpF,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,IAAI;YACF,QAAQ,OAAO,CAAC,SAAS,EAAE;gBACzB,KAAK,SAAS,CAAC,KAAK;oBAClB,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,KAAmB,CAAC,CAAC;oBAC/D,MAAM;gBACR,KAAK,SAAS,CAAC,WAAW;oBACxB,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAyB,CAAC,CAAC;oBAC3E,MAAM;gBACR,KAAK,SAAS,CAAC,EAAE;oBACf,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAgB,CAAC,CAAC;oBACzD,MAAM;aACT;SACF;QAAC,OAAO,CAAC,EAAE;SAEX;IACH,CAAC,CAAC;CACH;AApCD,0DAoCC"}
1
+ {"version":3,"file":"analytics-message-handler.js","sourceRoot":"","sources":["../../src/analytics-client/analytics-message-handler.ts"],"names":[],"mappings":";;;AAAA,sFAMoD;AAEpD,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,wCAA2B,CAAA;IAC3B,sBAAS,CAAA;AACX,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AAWD,MAAa,uBAAuB;IAGL;IAFZ,OAAO,CAAkB;IAE1C,YAA6B,WAAoB;QAApB,gBAAW,GAAX,WAAW,CAAS;QAC/C,IAAI,CAAC,OAAO,GAAG,IAAA,uCAAe,EAAC;YAC7B,GAAG,EAAE,IAAI,CAAC,WAAW,IAAI,MAAM;YAC/B,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,CAAC;YACV,aAAa,EAAE,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;IAOM,aAAa,GAAG,KAAK,EAAE,OAAqC,EAAiB,EAAE;QACpF,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QACD,IAAI;YACF,QAAQ,OAAO,CAAC,SAAS,EAAE;gBACzB,KAAK,SAAS,CAAC,KAAK;oBAClB,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,SAAS,CAAC,WAAW;oBACxB,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACvD,MAAM;gBACR,KAAK,SAAS,CAAC,EAAE;oBACf,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBAC9C,MAAM;aACT;SACF;QAAC,OAAO,CAAC,EAAE;SAEX;IACH,CAAC,CAAC;CACH;AAtCD,0DAsCC"}
@@ -5,19 +5,24 @@ const cli_shared_1 = require("@forge/cli-shared");
5
5
  const local_file_storage_1 = require("../storage/local-file-storage");
6
6
  const workers_starter_1 = require("../workers/workers-starter");
7
7
  const version_info_1 = require("../command-line/version-info");
8
- const anon_user_id_1 = require("../command-line/anon-user-id");
9
8
  const isSupportedShell_1 = require("../autocomplete/isSupportedShell");
10
9
  const cached_config_service_1 = require("../service/cached-config-service");
11
- const ui = new cli_shared_1.CommandLineUI(() => true);
12
- const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
13
- const configService = new cached_config_service_1.CachedConfigService(cachedConf);
14
- const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), configService);
15
- const cliDetails = (0, version_info_1.getCLIDetails)();
16
- const attributes = { version: cliDetails?.version };
17
- const anonId = (0, anon_user_id_1.getAnonId)(true);
18
- analyticsClientReporter.reportSuccess('postinstall', anonId, attributes);
19
- if ((0, isSupportedShell_1.isSupportedShell)()) {
20
- ui.info(cli_shared_1.Text.autocomplete.postinstall);
21
- }
22
- new workers_starter_1.WorkersStarter(undefined);
10
+ void (async () => {
11
+ const ui = new cli_shared_1.CommandLineUI(() => true);
12
+ const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
13
+ const configService = new cached_config_service_1.CachedConfigService(cachedConf);
14
+ const nullCredentialGetter = {
15
+ async getCredentials() {
16
+ throw new Error('No credentials');
17
+ }
18
+ };
19
+ const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), configService, nullCredentialGetter);
20
+ const cliDetails = (0, version_info_1.getCLIDetails)();
21
+ const attributes = { version: cliDetails?.version };
22
+ await analyticsClientReporter.reportSuccess('postinstall', attributes);
23
+ if ((0, isSupportedShell_1.isSupportedShell)()) {
24
+ ui.info(cli_shared_1.Text.autocomplete.postinstall);
25
+ }
26
+ new workers_starter_1.WorkersStarter(undefined);
27
+ })();
23
28
  //# sourceMappingURL=postinstall.js.map