@forge/cli 10.4.1 → 10.5.0-next.1-experimental-264fa0f
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.
- package/CHANGELOG.md +43 -0
- package/npm-shrinkwrap.json +334 -599
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +1 -1
- package/out/command-line/controller/settings-controller.d.ts +1 -1
- package/out/command-line/controller/settings-controller.d.ts.map +1 -1
- package/out/command-line/controller/settings-controller.js +1 -23
- package/out/command-line/controller/tunnel-controller.d.ts +2 -3
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +2 -5
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +6 -6
- package/out/command-line/view/tunnel-view.d.ts +1 -1
- package/out/command-line/view/tunnel-view.d.ts.map +1 -1
- package/out/command-line/view/tunnel-view.js +2 -2
- package/out/service/cached-config-service.d.ts +0 -2
- package/out/service/cached-config-service.d.ts.map +1 -1
- package/out/service/cached-config-service.js +0 -7
- package/out/service/tunnel-analytics-service.d.ts +2 -3
- package/out/service/tunnel-analytics-service.d.ts.map +1 -1
- package/out/service/tunnel-analytics-service.js +2 -4
- package/out/service/tunnel-service.d.ts +4 -10
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/service/tunnel-service.js +6 -38
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -205,7 +205,7 @@ class Command {
|
|
|
205
205
|
};
|
|
206
206
|
}
|
|
207
207
|
if (cmdName === 'tunnel') {
|
|
208
|
-
attributes['isCloudflareTunnel'] =
|
|
208
|
+
attributes['isCloudflareTunnel'] = true;
|
|
209
209
|
}
|
|
210
210
|
this.analyticsClient.reportCommandInvoke(analyticsName, cred, attributes);
|
|
211
211
|
const options = last(args);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AppConfigProvider } from '@forge/cli-shared';
|
|
2
2
|
import { CachedConfigService } from '../../service/cached-config-service';
|
|
3
3
|
import { SettingsView } from '../view/settings-view';
|
|
4
|
-
export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "
|
|
4
|
+
export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment"];
|
|
5
5
|
export declare class SettingsController {
|
|
6
6
|
private readonly settingsView;
|
|
7
7
|
private readonly cachedConfigService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAMlB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,qDAAsD,CAAC;AAYpF,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CAuClB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIX,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SettingsController = exports.ALLOWED_SETTINGS = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const promises_1 = tslib_1.__importDefault(require("fs/promises"));
|
|
6
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
8
5
|
const manifest_1 = require("@forge/manifest");
|
|
9
6
|
const environment_1 = require("../environment");
|
|
10
|
-
exports.ALLOWED_SETTINGS = ['usage-analytics', '
|
|
7
|
+
exports.ALLOWED_SETTINGS = ['usage-analytics', 'default-environment'];
|
|
11
8
|
class SettingsController {
|
|
12
9
|
settingsView;
|
|
13
10
|
cachedConfigService;
|
|
@@ -26,25 +23,6 @@ class SettingsController {
|
|
|
26
23
|
this.cachedConfigService.setAnalyticsPreferences(parsedValue);
|
|
27
24
|
}
|
|
28
25
|
},
|
|
29
|
-
'ngrok-config-path': {
|
|
30
|
-
description: cli_shared_1.Text.settings.ngrokConfig.description,
|
|
31
|
-
get: async () => this.cachedConfigService.getNgrokConfigPath(),
|
|
32
|
-
set: async (value) => {
|
|
33
|
-
value = path_1.default.resolve(value);
|
|
34
|
-
let stat;
|
|
35
|
-
try {
|
|
36
|
-
stat = await promises_1.default.stat(value);
|
|
37
|
-
}
|
|
38
|
-
catch (e) {
|
|
39
|
-
throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.ngrokConfig.errors.inaccessible(value, e.code));
|
|
40
|
-
}
|
|
41
|
-
if (!stat.isFile()) {
|
|
42
|
-
throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.ngrokConfig.errors.notAFile(value));
|
|
43
|
-
}
|
|
44
|
-
this.cachedConfigService.setNgrokConfigPath(value);
|
|
45
|
-
},
|
|
46
|
-
getDisplayValue: (value) => path_1.default.resolve(value)
|
|
47
|
-
},
|
|
48
26
|
'default-environment': {
|
|
49
27
|
description: cli_shared_1.Text.settings.defaultEnvironment.description,
|
|
50
28
|
get: async () => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CommandLineUI, ConfigFile, CredentialGetter, PersonalApiCredentialsValidated, TunnelCommandOptions, TunnelOptions
|
|
1
|
+
import { CommandLineUI, ConfigFile, CredentialGetter, PersonalApiCredentialsValidated, TunnelCommandOptions, TunnelOptions } from '@forge/cli-shared';
|
|
2
2
|
import { TunnelAnalyticsService } from '../../service/tunnel-analytics-service';
|
|
3
3
|
import { DockerTunnelService, TunnelService } from '../../service/tunnel-service';
|
|
4
4
|
import { TunnelView } from '../view/tunnel-view';
|
|
@@ -10,8 +10,7 @@ export declare class TunnelController {
|
|
|
10
10
|
private readonly tunnelView;
|
|
11
11
|
private readonly configFile;
|
|
12
12
|
private readonly credentialStore;
|
|
13
|
-
|
|
14
|
-
constructor(analyticsService: TunnelAnalyticsService, nodeTunnelService: TunnelService, localTunnelService: TunnelService, dockerTunnelService: DockerTunnelService, tunnelView: TunnelView, configFile: ConfigFile, credentialStore: CredentialGetter, featureFlagService: FeatureFlagService);
|
|
13
|
+
constructor(analyticsService: TunnelAnalyticsService, nodeTunnelService: TunnelService, localTunnelService: TunnelService, dockerTunnelService: DockerTunnelService, tunnelView: TunnelView, configFile: ConfigFile, credentialStore: CredentialGetter);
|
|
15
14
|
run(tunnelOptions: TunnelCommandOptions, ui: CommandLineUI): Promise<void>;
|
|
16
15
|
private validateTunnelCommandOptions;
|
|
17
16
|
runDockerTunnel(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,gBAAgB,EAChB,+BAA+B,EAC/B,oBAAoB,EAEpB,aAAa,
|
|
1
|
+
{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,gBAAgB,EAChB,+BAA+B,EAC/B,oBAAoB,EAEpB,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EACL,mBAAmB,EAGnB,aAAa,EACd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBANf,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,kBAAkB,EAAE,aAAa,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,gBAAgB;IAGvC,GAAG,CAAC,aAAa,EAAE,oBAAoB,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBvF,OAAO,CAAC,4BAA4B;IAgBvB,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
|
|
@@ -12,8 +12,7 @@ class TunnelController {
|
|
|
12
12
|
tunnelView;
|
|
13
13
|
configFile;
|
|
14
14
|
credentialStore;
|
|
15
|
-
|
|
16
|
-
constructor(analyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore, featureFlagService) {
|
|
15
|
+
constructor(analyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore) {
|
|
17
16
|
this.analyticsService = analyticsService;
|
|
18
17
|
this.nodeTunnelService = nodeTunnelService;
|
|
19
18
|
this.localTunnelService = localTunnelService;
|
|
@@ -21,15 +20,13 @@ class TunnelController {
|
|
|
21
20
|
this.tunnelView = tunnelView;
|
|
22
21
|
this.configFile = configFile;
|
|
23
22
|
this.credentialStore = credentialStore;
|
|
24
|
-
this.featureFlagService = featureFlagService;
|
|
25
23
|
}
|
|
26
24
|
async run(tunnelOptions, ui) {
|
|
27
25
|
const isNodeJsRuntime = (await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs;
|
|
28
26
|
const options = this.validateTunnelCommandOptions(isNodeJsRuntime, tunnelOptions);
|
|
29
27
|
const creds = await this.credentialStore.getCredentials();
|
|
30
28
|
const localTunnelErrorCallback = this.tunnelView.getTunnelErrorHandler(cli_shared_1.exitOnError);
|
|
31
|
-
|
|
32
|
-
this.tunnelView.dockerPreamble(isCloudflareTunnel, tunnelOptions.environment);
|
|
29
|
+
this.tunnelView.dockerPreamble(tunnelOptions.environment);
|
|
33
30
|
if (isNodeJsRuntime) {
|
|
34
31
|
return await this.nodeTunnelService.run(options, creds, ui.debugEnabled);
|
|
35
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAGnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAGnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgWvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
|
|
@@ -172,16 +172,16 @@ const getDependencies = async (cliDetails) => {
|
|
|
172
172
|
const createSandbox = async (cfg) => new tunnel_2.NodeSandbox(cfg);
|
|
173
173
|
const functionHost = new tunnel_1.LocalFunctionHost(configFile, ui, null, createSandbox);
|
|
174
174
|
const localInvocationService = new tunnel_1.LocalInvocationService(configFile, ui, runtime_1.notImplementedInspector);
|
|
175
|
-
const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader), new tunnel_1.
|
|
175
|
+
const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
|
|
176
176
|
const tunnelInteractor = new tunnel_1.TunnelInteractor(ui);
|
|
177
177
|
const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
|
|
178
|
-
const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails
|
|
179
|
-
const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, tunnelAnalyticsService
|
|
178
|
+
const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails);
|
|
179
|
+
const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, tunnelAnalyticsService);
|
|
180
180
|
const tunnelView = new tunnel_view_1.TunnelView(ui);
|
|
181
|
-
const localTunnelService = new tunnel_service_1.LocalTunnelService(configFilePortFindingService, cachedConfigService
|
|
181
|
+
const localTunnelService = new tunnel_service_1.LocalTunnelService(configFilePortFindingService, cachedConfigService);
|
|
182
182
|
const dockerService = new docker_service_1.DockerService();
|
|
183
|
-
const dockerTunnelService = new tunnel_service_1.DockerTunnelService(configFilePortFindingService, cachedConfigService, dockerService, tunnelAnalyticsService
|
|
184
|
-
const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore
|
|
183
|
+
const dockerTunnelService = new tunnel_service_1.DockerTunnelService(configFilePortFindingService, cachedConfigService, dockerService, tunnelAnalyticsService);
|
|
184
|
+
const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore);
|
|
185
185
|
const stubController = new stubController_1.StubController();
|
|
186
186
|
const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, featureFlagService, cliDetails);
|
|
187
187
|
const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
|
|
@@ -12,7 +12,7 @@ export declare class TunnelView {
|
|
|
12
12
|
private readonly ui;
|
|
13
13
|
private readonly FAILED_DOCKER_CONNECTION_MESSAGE;
|
|
14
14
|
constructor(ui: UI);
|
|
15
|
-
dockerPreamble(
|
|
15
|
+
dockerPreamble(environmentKey?: string): void;
|
|
16
16
|
getTunnelErrorHandler(exitFn: typeof exitOnError): (err: Error) => Promise<void>;
|
|
17
17
|
updatePullPercent(dataBuffer: Buffer, dockerPullPercent: number): number;
|
|
18
18
|
calculateProgress(progress: string, regex: RegExp, dockerPullPercent: number, clamp: number): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EAIX,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,EAAE;IAD/B,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAyC;gBAC7D,EAAE,EAAE,EAAE;IAE5B,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"tunnel-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,WAAW,EAIX,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,EAAE;IAD/B,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAyC;gBAC7D,EAAE,EAAE,EAAE;IAE5B,cAAc,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI;IAY7C,qBAAqB,CAAC,MAAM,EAAE,OAAO,WAAW,GAAG,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC;IAQhF,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,MAAM;IA+BxE,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;IAQpG,sBAAsB,CAC3B,yBAAyB,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,EACnD,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,yBAAyB,GAC3D,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
|
|
@@ -13,9 +13,9 @@ class TunnelView {
|
|
|
13
13
|
constructor(ui) {
|
|
14
14
|
this.ui = ui;
|
|
15
15
|
}
|
|
16
|
-
dockerPreamble(
|
|
16
|
+
dockerPreamble(environmentKey) {
|
|
17
17
|
this.ui.info(cli_shared_1.Text.tunnel.preamble);
|
|
18
|
-
this.ui.debug(cli_shared_1.Text.tunnel.tunnelType
|
|
18
|
+
this.ui.debug(cli_shared_1.Text.tunnel.tunnelType);
|
|
19
19
|
if (environmentKey && environmentKey !== cli_shared_1.DEFAULT_ENVIRONMENT_KEY) {
|
|
20
20
|
this.ui.emptyLine();
|
|
21
21
|
this.ui.info(cli_shared_1.Text.tunnel.startingTunnel(environmentKey, (0, cli_shared_1.guessEnvironmentType)(environmentKey)));
|
|
@@ -7,7 +7,5 @@ export declare class CachedConfigService {
|
|
|
7
7
|
private getDefaultEnvironments;
|
|
8
8
|
getDefaultEnvironment(appId: string): string | undefined;
|
|
9
9
|
setDefaultEnvironment(appId: string, preference: string): void;
|
|
10
|
-
getNgrokConfigPath(): string | undefined;
|
|
11
|
-
setNgrokConfigPath(preference: string): void;
|
|
12
10
|
}
|
|
13
11
|
//# sourceMappingURL=cached-config-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO/C,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,sBAAsB;IAIvB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAKtE"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CachedConfigService = void 0;
|
|
4
4
|
const ANALYTICS_PREFERENCES_KEY = 'analytics-preferences';
|
|
5
5
|
const DEFAULT_ENVIRONMENT_KEY = 'default-environment';
|
|
6
|
-
const NGROK_CONFIG_PATH_KEY = 'ngrok-config-path';
|
|
7
6
|
class CachedConfigService {
|
|
8
7
|
cachedConf;
|
|
9
8
|
constructor(cachedConf) {
|
|
@@ -30,11 +29,5 @@ class CachedConfigService {
|
|
|
30
29
|
defaultEnvironments[appId] = preference;
|
|
31
30
|
this.cachedConf.set(DEFAULT_ENVIRONMENT_KEY, defaultEnvironments);
|
|
32
31
|
}
|
|
33
|
-
getNgrokConfigPath() {
|
|
34
|
-
return this.cachedConf.get(NGROK_CONFIG_PATH_KEY);
|
|
35
|
-
}
|
|
36
|
-
setNgrokConfigPath(preference) {
|
|
37
|
-
this.cachedConf.set(NGROK_CONFIG_PATH_KEY, preference);
|
|
38
|
-
}
|
|
39
32
|
}
|
|
40
33
|
exports.CachedConfigService = CachedConfigService;
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { PersonalApiCredentialsValidated, CLIDetails
|
|
1
|
+
import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
|
|
2
2
|
import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
|
|
3
3
|
import { DownloadProgressCallbacks } from '../command-line/view/tunnel-view';
|
|
4
4
|
export declare class TunnelAnalyticsService {
|
|
5
5
|
private readonly analyticsClientReporter;
|
|
6
6
|
private readonly cliDetails;
|
|
7
|
-
|
|
8
|
-
constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined, featureFlagService: FeatureFlagService);
|
|
7
|
+
constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
|
|
9
8
|
reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
|
|
10
9
|
reportTunnelClosed(creds: PersonalApiCredentialsValidated): void;
|
|
11
10
|
reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,
|
|
1
|
+
{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAG9C,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAI1D,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAiB7B,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}
|
|
@@ -5,11 +5,9 @@ const cli_shared_1 = require("@forge/cli-shared");
|
|
|
5
5
|
class TunnelAnalyticsService {
|
|
6
6
|
analyticsClientReporter;
|
|
7
7
|
cliDetails;
|
|
8
|
-
|
|
9
|
-
constructor(analyticsClientReporter, cliDetails, featureFlagService) {
|
|
8
|
+
constructor(analyticsClientReporter, cliDetails) {
|
|
10
9
|
this.analyticsClientReporter = analyticsClientReporter;
|
|
11
10
|
this.cliDetails = cliDetails;
|
|
12
|
-
this.featureFlagService = featureFlagService;
|
|
13
11
|
}
|
|
14
12
|
reportDockerVersion(creds, dockerVersion) {
|
|
15
13
|
this.analyticsClientReporter.reportSuccess('docker version check', creds, {
|
|
@@ -25,7 +23,7 @@ class TunnelAnalyticsService {
|
|
|
25
23
|
version: this.cliDetails?.version,
|
|
26
24
|
latest: this.cliDetails?.latest,
|
|
27
25
|
isLatest: (0, cli_shared_1.isLatestCLIVersion)(this.cliDetails),
|
|
28
|
-
isCloudflareTunnel:
|
|
26
|
+
isCloudflareTunnel: true,
|
|
29
27
|
...attributes
|
|
30
28
|
};
|
|
31
29
|
if (attributes.isUserError === undefined) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { spawn } from 'cross-spawn';
|
|
2
|
-
import {
|
|
2
|
+
import { PersonalApiCredentials, PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
|
|
3
3
|
import { StartTunnelCommand, TunnelInteractor } from '@forge/tunnel';
|
|
4
4
|
import { CachedConfigService } from './cached-config-service';
|
|
5
5
|
import { DockerService } from './docker-service';
|
|
@@ -20,7 +20,6 @@ declare abstract class TunnelServiceBase implements TunnelService {
|
|
|
20
20
|
protected readonly cachedConfigService: CachedConfigService;
|
|
21
21
|
constructor(cachedConfigService: CachedConfigService);
|
|
22
22
|
abstract run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
|
|
23
|
-
protected ngrokConfigPath(): string;
|
|
24
23
|
}
|
|
25
24
|
export declare class InProcessTunnelService extends TunnelServiceBase {
|
|
26
25
|
private readonly ui;
|
|
@@ -28,8 +27,7 @@ export declare class InProcessTunnelService extends TunnelServiceBase {
|
|
|
28
27
|
private readonly tunnelInteractor;
|
|
29
28
|
private readonly configFilePortFindingService;
|
|
30
29
|
private readonly analyticsService;
|
|
31
|
-
|
|
32
|
-
constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService, featureFlagService: FeatureFlagService);
|
|
30
|
+
constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService);
|
|
33
31
|
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
|
|
34
32
|
}
|
|
35
33
|
interface EnvironmentVariable {
|
|
@@ -39,11 +37,9 @@ interface EnvironmentVariable {
|
|
|
39
37
|
declare abstract class SandboxTunnelServiceBase extends TunnelServiceBase {
|
|
40
38
|
protected readonly configFilePortFindingService: ConfigFilePortFindingService;
|
|
41
39
|
protected readonly cachedConfigService: CachedConfigService;
|
|
42
|
-
|
|
43
|
-
constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, featureFlagService: FeatureFlagService);
|
|
40
|
+
constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService);
|
|
44
41
|
getTunnelProcessEnvironment(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials, port: number, cspReporterPort: number | undefined, resourcePorts: Record<string, number>): Promise<EnvironmentVariable[]>;
|
|
45
42
|
private getInspectorPortEnvironment;
|
|
46
|
-
protected getNgrokConfigEnvironment(): EnvironmentVariable[];
|
|
47
43
|
private getCspReporterPortEnvironment;
|
|
48
44
|
private getResourcePortEnvironment;
|
|
49
45
|
private getUserEnvironmentVariables;
|
|
@@ -55,8 +51,7 @@ export declare class LocalTunnelService extends SandboxTunnelServiceBase {
|
|
|
55
51
|
export declare class DockerTunnelService extends SandboxTunnelServiceBase {
|
|
56
52
|
private readonly dockerService;
|
|
57
53
|
private readonly analyticsService;
|
|
58
|
-
|
|
59
|
-
constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, dockerService: DockerService, analyticsService: TunnelAnalyticsService, featureFlagService: FeatureFlagService);
|
|
54
|
+
constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
|
|
60
55
|
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
|
|
61
56
|
bootstrapDocker(): Promise<ReturnType<typeof spawn> | undefined>;
|
|
62
57
|
private validateDockerVersion;
|
|
@@ -64,7 +59,6 @@ export declare class DockerTunnelService extends SandboxTunnelServiceBase {
|
|
|
64
59
|
private formatEnvForDocker;
|
|
65
60
|
private getInteractiveOptions;
|
|
66
61
|
private getVolumeOptions;
|
|
67
|
-
protected getNgrokConfigEnvironment(): EnvironmentVariable[];
|
|
68
62
|
private getCommonOptions;
|
|
69
63
|
}
|
|
70
64
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAOpC,OAAO,
|
|
1
|
+
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ const cli_shared_1 = require("@forge/cli-shared");
|
|
|
12
12
|
const version_info_1 = require("../command-line/version-info");
|
|
13
13
|
const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
|
|
14
14
|
exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
|
|
15
|
-
const PATH_DOCKER_NGROK_CONFIG = '/opt/provided-ngrok-config.yml';
|
|
16
15
|
const cliDetails = (0, version_info_1.getCLIDetails)();
|
|
17
16
|
let versionTags;
|
|
18
17
|
if (cliDetails?.version !== undefined) {
|
|
@@ -46,13 +45,6 @@ class TunnelServiceBase {
|
|
|
46
45
|
constructor(cachedConfigService) {
|
|
47
46
|
this.cachedConfigService = cachedConfigService;
|
|
48
47
|
}
|
|
49
|
-
ngrokConfigPath() {
|
|
50
|
-
const path = this.cachedConfigService.getNgrokConfigPath();
|
|
51
|
-
if (!path) {
|
|
52
|
-
throw new cli_shared_1.UserError(cli_shared_1.Text.tunnel.error.noNgrokConfig);
|
|
53
|
-
}
|
|
54
|
-
return path;
|
|
55
|
-
}
|
|
56
48
|
}
|
|
57
49
|
class InProcessTunnelService extends TunnelServiceBase {
|
|
58
50
|
ui;
|
|
@@ -60,27 +52,21 @@ class InProcessTunnelService extends TunnelServiceBase {
|
|
|
60
52
|
tunnelInteractor;
|
|
61
53
|
configFilePortFindingService;
|
|
62
54
|
analyticsService;
|
|
63
|
-
|
|
64
|
-
constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService, featureFlagService) {
|
|
55
|
+
constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService) {
|
|
65
56
|
super(cachedConfigService);
|
|
66
57
|
this.ui = ui;
|
|
67
58
|
this.startTunnelCommand = startTunnelCommand;
|
|
68
59
|
this.tunnelInteractor = tunnelInteractor;
|
|
69
60
|
this.configFilePortFindingService = configFilePortFindingService;
|
|
70
61
|
this.analyticsService = analyticsService;
|
|
71
|
-
this.featureFlagService = featureFlagService;
|
|
72
62
|
}
|
|
73
63
|
async run(tunnelOptions, creds, debugEnabled, onError) {
|
|
74
64
|
try {
|
|
75
65
|
const resourcePortMap = await this.configFilePortFindingService.findPorts();
|
|
76
|
-
const ngrokConfig = (await this.featureFlagService.isCloudflareTunnelEnabled())
|
|
77
|
-
? undefined
|
|
78
|
-
: this.ngrokConfigPath();
|
|
79
66
|
const tunnel = await this.startTunnelCommand.execute({
|
|
80
67
|
environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
|
|
81
68
|
resourcePortMap,
|
|
82
|
-
host: 'localhost'
|
|
83
|
-
ngrokConfig
|
|
69
|
+
host: 'localhost'
|
|
84
70
|
});
|
|
85
71
|
const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
|
|
86
72
|
const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
|
|
@@ -101,18 +87,13 @@ exports.InProcessTunnelService = InProcessTunnelService;
|
|
|
101
87
|
class SandboxTunnelServiceBase extends TunnelServiceBase {
|
|
102
88
|
configFilePortFindingService;
|
|
103
89
|
cachedConfigService;
|
|
104
|
-
|
|
105
|
-
constructor(configFilePortFindingService, cachedConfigService, featureFlagService) {
|
|
90
|
+
constructor(configFilePortFindingService, cachedConfigService) {
|
|
106
91
|
super(cachedConfigService);
|
|
107
92
|
this.configFilePortFindingService = configFilePortFindingService;
|
|
108
93
|
this.cachedConfigService = cachedConfigService;
|
|
109
|
-
this.featureFlagService = featureFlagService;
|
|
110
94
|
}
|
|
111
95
|
async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
|
|
112
96
|
const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
|
|
113
|
-
const ngrokConfig = (await this.featureFlagService.isCloudflareTunnelEnabled())
|
|
114
|
-
? []
|
|
115
|
-
: this.getNgrokConfigEnvironment();
|
|
116
97
|
return [
|
|
117
98
|
{ key: 'APP_FOLDER', value: '/app' },
|
|
118
99
|
{ key: 'FORGE_EMAIL', value: email },
|
|
@@ -125,16 +106,12 @@ class SandboxTunnelServiceBase extends TunnelServiceBase {
|
|
|
125
106
|
...this.getInspectorPortEnvironment(port),
|
|
126
107
|
...this.getCspReporterPortEnvironment(cspReporterPort),
|
|
127
108
|
...this.getResourcePortEnvironment(resourcePorts),
|
|
128
|
-
...this.getUserEnvironmentVariables()
|
|
129
|
-
...ngrokConfig
|
|
109
|
+
...this.getUserEnvironmentVariables()
|
|
130
110
|
];
|
|
131
111
|
}
|
|
132
112
|
getInspectorPortEnvironment(port) {
|
|
133
113
|
return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
|
|
134
114
|
}
|
|
135
|
-
getNgrokConfigEnvironment() {
|
|
136
|
-
return [{ key: 'NGROK_CONFIG', value: this.ngrokConfigPath() }];
|
|
137
|
-
}
|
|
138
115
|
getCspReporterPortEnvironment(cspReporterPort) {
|
|
139
116
|
if (cspReporterPort) {
|
|
140
117
|
return [{ key: 'CSP_REPORTER_PORT', value: cspReporterPort.toString() }];
|
|
@@ -183,12 +160,10 @@ exports.LocalTunnelService = LocalTunnelService;
|
|
|
183
160
|
class DockerTunnelService extends SandboxTunnelServiceBase {
|
|
184
161
|
dockerService;
|
|
185
162
|
analyticsService;
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
super(configFilePortFindingService, cachedConfigService, featureFlagService);
|
|
163
|
+
constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService) {
|
|
164
|
+
super(configFilePortFindingService, cachedConfigService);
|
|
189
165
|
this.dockerService = dockerService;
|
|
190
166
|
this.analyticsService = analyticsService;
|
|
191
|
-
this.featureFlagService = featureFlagService;
|
|
192
167
|
}
|
|
193
168
|
async run(tunnelOptions, creds, debugEnabled) {
|
|
194
169
|
await this.validateDockerVersion(creds, debugEnabled);
|
|
@@ -265,7 +240,6 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
|
|
|
265
240
|
if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
|
|
266
241
|
const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
|
|
267
242
|
options.push(`-v=${monorepoRoot}:/monorepo:cached`);
|
|
268
|
-
options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
|
|
269
243
|
options.push(`-v=${monorepoRoot}/node_modules/cloudflared/docker-bin:/monorepo/node_modules/cloudflared/bin`);
|
|
270
244
|
}
|
|
271
245
|
if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
|
|
@@ -274,14 +248,8 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
|
|
|
274
248
|
options.push(`-v=${mount}:cached`);
|
|
275
249
|
});
|
|
276
250
|
}
|
|
277
|
-
if (!(await this.featureFlagService.isCloudflareTunnelEnabled())) {
|
|
278
|
-
options.push('--mount', `type=bind,source=${this.ngrokConfigPath()},target=${PATH_DOCKER_NGROK_CONFIG}`);
|
|
279
|
-
}
|
|
280
251
|
return options;
|
|
281
252
|
}
|
|
282
|
-
getNgrokConfigEnvironment() {
|
|
283
|
-
return [{ key: 'NGROK_CONFIG', value: PATH_DOCKER_NGROK_CONFIG }];
|
|
284
|
-
}
|
|
285
253
|
async getCommonOptions() {
|
|
286
254
|
return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
|
|
287
255
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/cli",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.5.0-next.1-experimental-264fa0f",
|
|
4
4
|
"description": "A command line interface for managing Atlassian-hosted apps",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -18,20 +18,20 @@
|
|
|
18
18
|
"postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@forge/bundler": "4.17.
|
|
22
|
-
"@forge/cli-shared": "5.
|
|
21
|
+
"@forge/bundler": "4.17.6-next.1-experimental-264fa0f",
|
|
22
|
+
"@forge/cli-shared": "5.4.0-next.1-experimental-264fa0f",
|
|
23
23
|
"@forge/egress": "1.2.13",
|
|
24
|
-
"@forge/lint": "5.3.1",
|
|
25
|
-
"@forge/manifest": "7.5.
|
|
24
|
+
"@forge/lint": "5.3.2-next.1-experimental-264fa0f",
|
|
25
|
+
"@forge/manifest": "7.5.4-next.0-experimental-264fa0f",
|
|
26
26
|
"@forge/runtime": "5.10.1",
|
|
27
|
-
"@forge/tunnel": "5.
|
|
27
|
+
"@forge/tunnel": "5.4.0-next.1-experimental-264fa0f",
|
|
28
28
|
"@forge/util": "1.4.4",
|
|
29
29
|
"@sentry/node": "7.100.1",
|
|
30
30
|
"ajv": "^8.12.0",
|
|
31
31
|
"archiver": "^6.0.2",
|
|
32
32
|
"case": "^1.6.3",
|
|
33
33
|
"chalk": "^4.1.2",
|
|
34
|
-
"cheerio": "^0.
|
|
34
|
+
"cheerio": "^1.0.0",
|
|
35
35
|
"cli-table3": "^0.6.3",
|
|
36
36
|
"command-exists": "^1.2.9",
|
|
37
37
|
"commander": "^11.1.0",
|