@forge/cli 14.0.0 → 14.1.0-next.1-experimental-13c2f8d

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 (59) hide show
  1. package/CHANGELOG.md +51 -0
  2. package/README.md +42 -0
  3. package/docs/local-storage.md +82 -0
  4. package/npm-shrinkwrap.json +35 -35
  5. package/out/autocomplete/autocomplete-config.json +3 -0
  6. package/out/command-line/controller/local-storage-controller.d.ts +18 -0
  7. package/out/command-line/controller/local-storage-controller.d.ts.map +1 -0
  8. package/out/command-line/controller/local-storage-controller.js +52 -0
  9. package/out/command-line/controller/local-storage-controller.js.map +1 -0
  10. package/out/command-line/controller/tunnel-controller.d.ts +3 -1
  11. package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
  12. package/out/command-line/controller/tunnel-controller.js +49 -25
  13. package/out/command-line/controller/tunnel-controller.js.map +1 -1
  14. package/out/command-line/dependency-injection.d.ts +4 -0
  15. package/out/command-line/dependency-injection.d.ts.map +1 -1
  16. package/out/command-line/dependency-injection.js +15 -4
  17. package/out/command-line/dependency-injection.js.map +1 -1
  18. package/out/command-line/register-installation-commands.d.ts.map +1 -1
  19. package/out/command-line/register-installation-commands.js +59 -50
  20. package/out/command-line/register-installation-commands.js.map +1 -1
  21. package/out/command-line/register-storage-commands.d.ts.map +1 -1
  22. package/out/command-line/register-storage-commands.js +38 -0
  23. package/out/command-line/register-storage-commands.js.map +1 -1
  24. package/out/command-line/register-tunnel-commands.d.ts.map +1 -1
  25. package/out/command-line/register-tunnel-commands.js +1 -0
  26. package/out/command-line/register-tunnel-commands.js.map +1 -1
  27. package/out/command-line/uninstall-command-helpers.d.ts.map +1 -1
  28. package/out/command-line/uninstall-command-helpers.js +28 -5
  29. package/out/command-line/uninstall-command-helpers.js.map +1 -1
  30. package/out/command-line/view/local-storage-view.d.ts +15 -0
  31. package/out/command-line/view/local-storage-view.d.ts.map +1 -0
  32. package/out/command-line/view/local-storage-view.js +79 -0
  33. package/out/command-line/view/local-storage-view.js.map +1 -0
  34. package/out/containers/container-command.d.ts +1 -1
  35. package/out/containers/container-command.d.ts.map +1 -1
  36. package/out/installations/uninstall-app.d.ts +3 -0
  37. package/out/installations/uninstall-app.d.ts.map +1 -1
  38. package/out/installations/uninstall-app.js +7 -2
  39. package/out/installations/uninstall-app.js.map +1 -1
  40. package/out/service/local-storage-lifecycle.d.ts +91 -0
  41. package/out/service/local-storage-lifecycle.d.ts.map +1 -0
  42. package/out/service/local-storage-lifecycle.js +167 -0
  43. package/out/service/local-storage-lifecycle.js.map +1 -0
  44. package/out/service/local-storage-manifest.d.ts +20 -0
  45. package/out/service/local-storage-manifest.d.ts.map +1 -0
  46. package/out/service/local-storage-manifest.js +48 -0
  47. package/out/service/local-storage-manifest.js.map +1 -0
  48. package/out/service/local-storage-service.d.ts +58 -0
  49. package/out/service/local-storage-service.d.ts.map +1 -0
  50. package/out/service/local-storage-service.js +204 -0
  51. package/out/service/local-storage-service.js.map +1 -0
  52. package/out/service/tunnel-service.d.ts.map +1 -1
  53. package/out/service/tunnel-service.js +14 -5
  54. package/out/service/tunnel-service.js.map +1 -1
  55. package/out/service/version-service.d.ts +21 -0
  56. package/out/service/version-service.d.ts.map +1 -1
  57. package/out/service/version-service.js +75 -5
  58. package/out/service/version-service.js.map +1 -1
  59. package/package.json +6 -6
@@ -0,0 +1,204 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.LocalStorageService = exports.LocalStorageApiError = exports.LocalStorageConfigurationError = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const fs_1 = tslib_1.__importDefault(require("fs"));
6
+ const cli_shared_1 = require("@forge/cli-shared");
7
+ const local_storage_manifest_1 = require("./local-storage-manifest");
8
+ class LocalStorageConfigurationError extends cli_shared_1.UserError {
9
+ }
10
+ exports.LocalStorageConfigurationError = LocalStorageConfigurationError;
11
+ class LocalStorageApiError extends cli_shared_1.UserError {
12
+ operationIndex;
13
+ constructor(message, operationIndex) {
14
+ super(message);
15
+ this.operationIndex = operationIndex;
16
+ }
17
+ }
18
+ exports.LocalStorageApiError = LocalStorageApiError;
19
+ class LocalStorageService {
20
+ configFile;
21
+ lifecycle;
22
+ appDirectory;
23
+ fetchClient;
24
+ constructor(configFile, lifecycle, fetchClient = fetch, appDirectory = process.cwd()) {
25
+ this.configFile = configFile;
26
+ this.lifecycle = lifecycle;
27
+ this.appDirectory = appDirectory;
28
+ this.fetchClient = fetchClient;
29
+ }
30
+ async manifest() {
31
+ return (0, local_storage_manifest_1.inspectLocalStorageManifest)(await this.configFile.readConfig(), this.appDirectory);
32
+ }
33
+ async start() {
34
+ const manifest = await this.manifest();
35
+ await this.ensureAvailable(manifest, (0, local_storage_manifest_1.configuredOfferings)(manifest));
36
+ return manifest;
37
+ }
38
+ async status() {
39
+ const manifest = await this.manifest();
40
+ const empty = { state: 'stopped', healthy: false };
41
+ const offerings = (0, local_storage_manifest_1.configuredOfferings)(manifest);
42
+ const discovered = offerings.length ? await this.lifecycle.status() : undefined;
43
+ const runtime = Object.fromEntries(['kvs', 'sql'].map((offering) => [
44
+ offering,
45
+ manifest.configured[offering] && discovered ? discovered[offering] : empty
46
+ ]));
47
+ return { manifest, runtime };
48
+ }
49
+ async stop() {
50
+ await this.lifecycle.stop();
51
+ }
52
+ async seed(options) {
53
+ const manifest = await this.manifest();
54
+ const requested = [options.kvsPath && 'kvs', options.sqlPath && 'sql'].filter(Boolean);
55
+ if (!requested.length)
56
+ return [];
57
+ this.assertConfigured(manifest, requested);
58
+ const kvsSeed = options.kvsPath ? fs_1.default.readFileSync(options.kvsPath, 'utf8') : undefined;
59
+ const sqlSeed = options.sqlPath ? fs_1.default.readFileSync(options.sqlPath, 'utf8') : undefined;
60
+ await this.ensureAvailable(manifest, requested);
61
+ const tasks = [];
62
+ if (kvsSeed !== undefined)
63
+ tasks.push(this.seedKvs(manifest, kvsSeed));
64
+ if (sqlSeed !== undefined)
65
+ tasks.push(this.seedSql(manifest, sqlSeed));
66
+ return Promise.all(tasks);
67
+ }
68
+ async reset(options) {
69
+ if (options.kvs && options.sql) {
70
+ throw new LocalStorageConfigurationError('Use bare reset to clear every configured local-storage offering.');
71
+ }
72
+ const manifest = await this.manifest();
73
+ const explicit = options.kvs ? ['kvs'] : options.sql ? ['sql'] : undefined;
74
+ const requested = explicit ?? (0, local_storage_manifest_1.configuredOfferings)(manifest);
75
+ this.assertConfigured(manifest, requested);
76
+ await this.ensureAvailable(manifest, requested);
77
+ return Promise.all(requested.map((offering) => this.resetOffering(manifest, offering)));
78
+ }
79
+ async startForTunnel() {
80
+ const manifest = await this.start();
81
+ const environment = (0, local_storage_manifest_1.localStorageEnvironment)(manifest.namespace);
82
+ for (const [key, value] of Object.entries(environment))
83
+ process.env[key] = value;
84
+ return manifest;
85
+ }
86
+ async stopForTunnel() {
87
+ try {
88
+ await this.stop();
89
+ }
90
+ finally {
91
+ for (const key of Object.keys((0, local_storage_manifest_1.localStorageEnvironment)({ appId: '', environmentId: '', installationId: '' }))) {
92
+ delete process.env[key];
93
+ }
94
+ }
95
+ }
96
+ async ensureAvailable(manifest, offerings) {
97
+ if (!offerings.length)
98
+ return;
99
+ try {
100
+ await this.lifecycle.start(offerings);
101
+ await Promise.all(offerings.map((offering) => this.bootstrap(manifest, offering)));
102
+ }
103
+ catch (error) {
104
+ try {
105
+ await this.lifecycle.stop();
106
+ }
107
+ catch { }
108
+ throw error;
109
+ }
110
+ }
111
+ assertConfigured(manifest, offerings) {
112
+ for (const offering of offerings) {
113
+ if (!manifest.configured[offering]) {
114
+ const declaration = offering === 'kvs' ? 'the storage:app permission scope' : 'a modules.sql entry';
115
+ throw new LocalStorageConfigurationError(`${offering.toUpperCase()} is not configured; add ${declaration} to manifest.yml.`);
116
+ }
117
+ }
118
+ }
119
+ async bootstrap(manifest, offering) {
120
+ if (offering === 'kvs') {
121
+ await this.post('http://127.0.0.1:18090/_local/v1/bootstrap', { entities: manifest.entities }, manifest);
122
+ }
123
+ else {
124
+ await this.post('http://127.0.0.1:18091/_local/v1/bootstrap', {}, manifest);
125
+ }
126
+ }
127
+ async seedKvs(manifest, seed) {
128
+ try {
129
+ const result = await this.postRaw('http://127.0.0.1:18090/_local/v1/seed', seed, manifest);
130
+ return {
131
+ offering: 'kvs',
132
+ ok: true,
133
+ records: typeof result.recordsSeeded === 'number' ? result.recordsSeeded : undefined
134
+ };
135
+ }
136
+ catch (error) {
137
+ return { offering: 'kvs', ok: false, error: error };
138
+ }
139
+ }
140
+ async seedSql(manifest, sql) {
141
+ try {
142
+ const result = await this.post('http://127.0.0.1:18091/_local/v1/seed', { sql }, manifest);
143
+ return {
144
+ offering: 'sql',
145
+ ok: true,
146
+ statements: typeof result.statementsExecuted === 'number' ? result.statementsExecuted : undefined
147
+ };
148
+ }
149
+ catch (error) {
150
+ return { offering: 'sql', ok: false, error: error };
151
+ }
152
+ }
153
+ async resetOffering(manifest, offering) {
154
+ const endpoint = offering === 'kvs' ? 'http://127.0.0.1:18090/_local/v1/reset' : 'http://127.0.0.1:18091/_local/v1/reset';
155
+ try {
156
+ const result = await this.post(endpoint, {}, manifest);
157
+ return {
158
+ offering,
159
+ ok: true,
160
+ removed: typeof result.recordsRemoved === 'number' ? result.recordsRemoved : undefined
161
+ };
162
+ }
163
+ catch (error) {
164
+ return { offering, ok: false, error: error };
165
+ }
166
+ }
167
+ async post(url, body, manifest) {
168
+ return this.postRaw(url, JSON.stringify(body), manifest);
169
+ }
170
+ async postRaw(url, body, manifest) {
171
+ let response;
172
+ try {
173
+ response = await this.fetchClient(url, {
174
+ method: 'POST',
175
+ headers: (0, local_storage_manifest_1.localStorageHeaders)(manifest.namespace),
176
+ body
177
+ });
178
+ }
179
+ catch (error) {
180
+ throw new LocalStorageApiError(`Local storage request failed: ${error.message}`);
181
+ }
182
+ const text = await response.text();
183
+ let parsed = {};
184
+ if (text) {
185
+ try {
186
+ parsed = JSON.parse(text);
187
+ }
188
+ catch {
189
+ throw new LocalStorageApiError(`Local storage returned invalid JSON (HTTP ${response.status}): ${text}`);
190
+ }
191
+ }
192
+ if (!response.ok) {
193
+ const debug = isObject(parsed.debug) ? parsed.debug : {};
194
+ const operationIndex = typeof debug.errorOperationIndex === 'number' ? debug.errorOperationIndex : undefined;
195
+ const detail = typeof parsed.message === 'string' ? parsed.message : text || response.statusText;
196
+ const location = typeof parsed.location === 'string' ? `${parsed.location}: ` : '';
197
+ throw new LocalStorageApiError(`Local storage returned HTTP ${response.status}: ${location}${detail}`, operationIndex);
198
+ }
199
+ return parsed;
200
+ }
201
+ }
202
+ exports.LocalStorageService = LocalStorageService;
203
+ const isObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
204
+ //# sourceMappingURL=local-storage-service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local-storage-service.js","sourceRoot":"","sources":["../../src/service/local-storage-service.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
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,MAAM,MAAM,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;AAED,qBAAa,gBAAiB,SAAQ,SAAS;gBACjC,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;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;CAkB9D"}
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,MAAM,MAAM,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;AAED,qBAAa,gBAAiB,SAAQ,SAAS;gBACjC,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;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;CA2B9D"}
@@ -44,16 +44,25 @@ class InProcessTunnelService {
44
44
  }
45
45
  async run(tunnelOptions) {
46
46
  const resourcePortMap = await this.configFilePortFindingService.findPorts();
47
- const tunnel = await this.startTunnelCommand.execute({
47
+ const startOptions = {
48
48
  environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
49
49
  resourcePortMap,
50
50
  host: 'localhost',
51
51
  url: tunnelOptions.url,
52
52
  port: tunnelOptions.localPort
53
- }, tunnelOptions.containersDockerComposeFiles);
54
- const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
55
- const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
56
- await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
53
+ };
54
+ const tunnel = tunnelOptions.localStorageCleanup
55
+ ? await this.startTunnelCommand.execute(startOptions, tunnelOptions.containersDockerComposeFiles, tunnelOptions.localStorageCleanup)
56
+ : await this.startTunnelCommand.execute(startOptions, tunnelOptions.containersDockerComposeFiles);
57
+ try {
58
+ const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
59
+ const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
60
+ await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor, manifestFileWatcher);
61
+ }
62
+ catch (error) {
63
+ await tunnel.stopFunction();
64
+ throw error;
65
+ }
57
66
  }
58
67
  }
59
68
  exports.InProcessTunnelService = InProcessTunnelService;
@@ -1 +1 @@
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;AAED,MAAa,gBAAiB,SAAQ,sBAAS;IAC7C,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;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,CAClD;YACE,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,EACD,aAAa,CAAC,4BAA4B,CAC3C,CAAC;QAEF,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;AAzBD,wDAyBC"}
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;AAED,MAAa,gBAAiB,SAAQ,sBAAS;IAC7C,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;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,YAAY,GAAG;YACnB,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,CAAC;QACF,MAAM,MAAM,GAAG,aAAa,CAAC,mBAAmB;YAC9C,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CACnC,YAAY,EACZ,aAAa,CAAC,4BAA4B,EAC1C,aAAa,CAAC,mBAAmB,CAClC;YACH,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,4BAA4B,CAAC,CAAC;QAEpG,IAAI,CAAC;YACH,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;QACrG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;YAC5B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAlCD,wDAkCC"}
@@ -40,8 +40,27 @@ export interface VersionDetails {
40
40
  baseUrl: string;
41
41
  operations: string[];
42
42
  }[];
43
+ services: VersionServiceDetails[];
43
44
  environment: string;
44
45
  }
46
+ export interface VersionServiceContainerDetails {
47
+ key: string;
48
+ tag?: string;
49
+ health?: {
50
+ type: string;
51
+ route: {
52
+ path: string;
53
+ };
54
+ };
55
+ resources?: {
56
+ cpu: string;
57
+ memory: string;
58
+ };
59
+ }
60
+ export interface VersionServiceDetails {
61
+ key: string;
62
+ containers: VersionServiceContainerDetails[];
63
+ }
45
64
  export interface VersionOverview {
46
65
  version: number;
47
66
  deploymentDateTime: Date;
@@ -62,6 +81,7 @@ export interface VersionOverview {
62
81
  connectKeys: string;
63
82
  functions: string;
64
83
  remotes: string;
84
+ services: string;
65
85
  modules: {
66
86
  type: string;
67
87
  count: number;
@@ -90,6 +110,7 @@ export declare class VersionService {
90
110
  private getPolicies;
91
111
  private getConnectedKeys;
92
112
  private getFunctions;
113
+ private getServices;
93
114
  getAppVersionDetails(environmentKey: string, majorVersion?: number): Promise<VersionDetails>;
94
115
  private getTypeFromPermissionType;
95
116
  private getModulesGroupedByTypes;
@@ -1 +1 @@
1
- {"version":3,"file":"version-service.d.ts","sourceRoot":"","sources":["../../src/service/version-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"version-service.d.ts","sourceRoot":"","sources":["../../src/service/version-service.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,64 @@ exports.VersionService = exports.MissingVersionUpgradeParameters = void 0;
4
4
  const semver_1 = require("semver");
5
5
  const cli_shared_1 = require("@forge/cli-shared");
6
6
  const manifest_1 = require("@forge/manifest");
7
+ const byKey = (left, right) => left.key.localeCompare(right.key);
8
+ const asNonEmptyString = (value) => typeof value === 'string' && value.length > 0 ? value : undefined;
9
+ function isServiceExtension(extensionData) {
10
+ return (typeof extensionData === 'object' && extensionData !== null && extensionData.type === manifest_1.AllModuleTypes.CoreService);
11
+ }
12
+ function parseServiceHealth(health) {
13
+ if (typeof health?.type !== 'string' || typeof health.route?.path !== 'string') {
14
+ return undefined;
15
+ }
16
+ return { type: health.type, route: { path: health.route.path } };
17
+ }
18
+ function parseServiceResources(resources) {
19
+ if (typeof resources?.cpu !== 'string' || typeof resources.memory !== 'string') {
20
+ return undefined;
21
+ }
22
+ return { cpu: resources.cpu, memory: resources.memory };
23
+ }
24
+ function parseServiceContainer(container) {
25
+ const key = asNonEmptyString(container.key);
26
+ if (!key) {
27
+ return undefined;
28
+ }
29
+ const parsed = { key };
30
+ if (typeof container.tag === 'string') {
31
+ parsed.tag = container.tag;
32
+ }
33
+ const health = parseServiceHealth(container.health);
34
+ if (health) {
35
+ parsed.health = health;
36
+ }
37
+ const resources = parseServiceResources(container.resources);
38
+ if (resources) {
39
+ parsed.resources = resources;
40
+ }
41
+ return parsed;
42
+ }
43
+ function parseService(entry) {
44
+ if (!isServiceExtension(entry.extensionData)) {
45
+ return undefined;
46
+ }
47
+ const key = asNonEmptyString(entry.key) ?? asNonEmptyString(entry.extensionData.key);
48
+ if (!key) {
49
+ return undefined;
50
+ }
51
+ const rawContainers = Array.isArray(entry.extensionData.containers) ? entry.extensionData.containers : [];
52
+ const containers = [];
53
+ for (const rawContainer of rawContainers) {
54
+ if (!rawContainer) {
55
+ continue;
56
+ }
57
+ const container = parseServiceContainer(rawContainer);
58
+ if (container) {
59
+ containers.push(container);
60
+ }
61
+ }
62
+ containers.sort(byKey);
63
+ return { key, containers };
64
+ }
7
65
  class MissingVersionUpgradeParameters extends Error {
8
66
  constructor() {
9
67
  super(cli_shared_1.Text.version.upgrade.start.error.missingVersionUpgradeParameters);
@@ -94,11 +152,21 @@ class VersionService {
94
152
  }
95
153
  });
96
154
  }
155
+ getServices(modules) {
156
+ const services = [];
157
+ for (const entry of this.filterOutEmpty(modules)) {
158
+ const service = parseService(entry);
159
+ if (service) {
160
+ services.push(service);
161
+ }
162
+ }
163
+ return services.sort(byKey);
164
+ }
97
165
  async getAppVersionDetails(environmentKey, majorVersion) {
98
166
  const { id: appId } = await this.getAppConfig();
99
167
  const data = await this.versionDetailsClient.getVersionDetails(appId, environmentKey, majorVersion);
100
- const functionModules = data.modules?.filter((mod) => mod?.extensionData.type === manifest_1.AllModuleTypes.CoreFunction);
101
- const remoteModules = data.modules?.filter((mod) => mod?.extensionData.type === manifest_1.AllModuleTypes.CoreRemote);
168
+ const functionModules = data.modules?.filter((mod) => mod?.extensionData?.type === manifest_1.AllModuleTypes.CoreFunction);
169
+ const remoteModules = data.modules?.filter((mod) => mod?.extensionData?.type === manifest_1.AllModuleTypes.CoreRemote);
102
170
  const allModules = this.getModulesGroupedByTypes(data.modules);
103
171
  const appDetails = {
104
172
  requiresLicense: data.requiresLicense,
@@ -112,13 +180,14 @@ class VersionService {
112
180
  environmentType: data.environmentType,
113
181
  functions: this.getFunctions(functionModules),
114
182
  modules: Object.keys(allModules)
115
- .filter((type) => !['function', 'remote'].includes(type))
183
+ .filter((type) => !['function', 'remote', 'service'].includes(type))
116
184
  .map((type) => ({ type, items: allModules[type] })),
117
185
  remotes: this.filterOutEmpty(remoteModules).map((entry) => ({
118
186
  key: entry.key || 'N/A',
119
187
  baseUrl: entry.extensionData.baseUrl,
120
188
  operations: entry.extensionData.operations || []
121
189
  })),
190
+ services: this.getServices(data.modules),
122
191
  environment: (0, cli_shared_1.environmentToOption)(environmentKey)
123
192
  };
124
193
  this.applyPropertyAdapter(appDetails);
@@ -136,8 +205,8 @@ class VersionService {
136
205
  }
137
206
  getModulesGroupedByTypes(modules) {
138
207
  const rawModules = this.filterOutEmpty(modules)
139
- .filter((mod) => manifest_1.SUPPORTED_MODULES.includes(mod.extensionData.type))
140
- .filter((mod) => ![manifest_1.AllModuleTypes.CoreFunction, manifest_1.AllModuleTypes.CoreRemote].includes(mod.extensionData.type))
208
+ .filter((mod) => mod.extensionData && manifest_1.SUPPORTED_MODULES.includes(mod.extensionData.type))
209
+ .filter((mod) => ![manifest_1.AllModuleTypes.CoreFunction, manifest_1.AllModuleTypes.CoreRemote, manifest_1.AllModuleTypes.CoreService].includes(mod.extensionData.type))
141
210
  .map((entry) => ({
142
211
  key: entry.key,
143
212
  type: entry.extensionData.type,
@@ -177,6 +246,7 @@ class VersionService {
177
246
  connectKeys: (entry.connectKeys.length || 0).toString(),
178
247
  functions: (entry.functions.length || 0).toString(),
179
248
  remotes: (entry.remotes.length || 0).toString(),
249
+ services: (entry.services.length || 0).toString(),
180
250
  modules: entry.modules.map((module) => ({ type: module.type, count: module.items.length })),
181
251
  requiresLicense: entry.requiresLicense
182
252
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../src/service/version-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../src/service/version-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "14.0.0",
3
+ "version": "14.1.0-next.1-experimental-13c2f8d",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -21,14 +21,14 @@
21
21
  "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
22
22
  },
23
23
  "dependencies": {
24
- "@forge/bundler": "7.2.2",
25
- "@forge/cli-shared": "9.6.0",
24
+ "@forge/bundler": "7.2.3-next.1-experimental-13c2f8d",
25
+ "@forge/cli-shared": "9.7.0-next.1-experimental-13c2f8d",
26
26
  "@forge/egress": "3.0.0",
27
- "@forge/lint": "6.2.2",
28
- "@forge/manifest": "13.5.0",
27
+ "@forge/lint": "6.2.3-next.1-experimental-13c2f8d",
28
+ "@forge/manifest": "13.5.1-next.0-experimental-13c2f8d",
29
29
  "@forge/i18n": "1.0.0",
30
30
  "@forge/runtime": "7.0.0",
31
- "@forge/tunnel": "7.1.3",
31
+ "@forge/tunnel": "7.1.4-next.1-experimental-13c2f8d",
32
32
  "@forge/util": "3.0.0",
33
33
  "@sentry/node": "7.106.0",
34
34
  "ajv": "^8.18.0",