@forge/cli 12.0.0-next.7 → 12.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +163 -0
- package/npm-shrinkwrap.json +1298 -1279
- package/out/analytics-client/analytics-client.d.ts +2 -3
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/analytics-client/analytics-client.js +2 -9
- package/out/analytics-client/analytics-client.js.map +1 -1
- package/out/bin/postinstall.js +1 -1
- package/out/bin/postinstall.js.map +1 -1
- package/out/command-line/controller/tunnel-controller.d.ts +3 -7
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +2 -22
- package/out/command-line/controller/tunnel-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts +1 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +10 -12
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/register-log-commands.d.ts.map +1 -1
- package/out/command-line/register-log-commands.js +2 -1
- package/out/command-line/register-log-commands.js.map +1 -1
- package/out/command-line/register-version-commands.js +2 -2
- package/out/command-line/register-version-commands.js.map +1 -1
- package/out/command-line/version-info.js +1 -1
- package/out/command-line/version-info.js.map +1 -1
- package/out/command-line/view/tunnel-view.d.ts +2 -16
- package/out/command-line/view/tunnel-view.d.ts.map +1 -1
- package/out/command-line/view/tunnel-view.js +2 -90
- package/out/command-line/view/tunnel-view.js.map +1 -1
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/deploy-monitor-graphql-client.js +0 -4
- package/out/deploy/deployer/deploy-monitor-graphql-client.js.map +1 -1
- package/out/deploy/deployer/deployer.d.ts +0 -5
- package/out/deploy/deployer/deployer.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.js +1 -33
- package/out/deploy/deployer/deployer.js.map +1 -1
- package/out/deploy/packager/archiver.d.ts +1 -0
- package/out/deploy/packager/archiver.d.ts.map +1 -1
- package/out/deploy/packager/runtime-bundler.d.ts +0 -3
- package/out/deploy/packager/runtime-bundler.d.ts.map +1 -1
- package/out/deploy/packager/runtime-bundler.js +5 -12
- package/out/deploy/packager/runtime-bundler.js.map +1 -1
- package/out/service/docker-service.d.ts +0 -4
- package/out/service/docker-service.d.ts.map +1 -1
- package/out/service/docker-service.js +0 -26
- package/out/service/docker-service.js.map +1 -1
- package/out/service/tunnel-analytics-service.d.ts +0 -4
- package/out/service/tunnel-analytics-service.d.ts.map +1 -1
- package/out/service/tunnel-analytics-service.js +0 -15
- package/out/service/tunnel-analytics-service.js.map +1 -1
- package/out/service/tunnel-service.d.ts +1 -36
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/service/tunnel-service.js +1 -197
- package/out/service/tunnel-service.js.map +1 -1
- package/package.json +11 -10
- package/out/workers/tunnel-clean-up-worker.d.ts +0 -8
- package/out/workers/tunnel-clean-up-worker.d.ts.map +0 -1
- package/out/workers/tunnel-clean-up-worker.js +0 -32
- package/out/workers/tunnel-clean-up-worker.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-view.js","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tunnel-view.js","sourceRoot":"","sources":["../../../src/command-line/view/tunnel-view.ts"],"names":[],"mappings":";;;AAAA,kDAA4F;AAE5F,MAAa,UAAU;IACQ;IAA7B,YAA6B,EAAM;QAAN,OAAE,GAAF,EAAE,CAAI;IAAG,CAAC;IAEhC,QAAQ,CAAC,cAAuB;QACrC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,cAAc,IAAI,cAAc,KAAK,oCAAuB,EAAE;YAChE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,IAAA,iCAAoB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YAC/F,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;SACrB;QACD,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;IACtB,CAAC;IAEM,+BAA+B,GAAG,CAAC,OAAiB,EAAQ,EAAE;QACnE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;QACpB,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;IACtB,CAAC,CAAC;CACH;AAnBD,gCAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-monitor-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,EAC5B,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,cAAc,GAAG,QAAQ,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAG9G,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAEtH,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACtE;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-monitor-graphql-client.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,EAC5B,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,cAAc,GAAG,QAAQ,CAAC,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAG9G,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAEtH,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACtE;AAED,qBAAa,0BAA2B,YAAW,mBAAmB;IACxD,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;CA0ClH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-monitor-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":";;;AASA,mFAAoE;AAiBpE,MAAa,0BAA0B;IACR;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEtD,KAAK,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAwB;QACtF,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CACjE
|
|
1
|
+
{"version":3,"file":"deploy-monitor-graphql-client.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deploy-monitor-graphql-client.ts"],"names":[],"mappings":";;;AASA,mFAAoE;AAiBpE,MAAa,0BAA0B;IACR;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEtD,KAAK,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,YAAY,EAAwB;QACtF,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CACjE;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BC,EACD;YACE,KAAK;YACL,cAAc;YACd,EAAE,EAAE,YAAY;SACjB,CACF,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAI,iDAAiB,EAAE,CAAC;SAC/B;QAED,OAAO,EAAE,GAAG,aAAa,EAAE,SAAS,EAAE,CAAC;IACzC,CAAC;CACF;AA7CD,gEA6CC"}
|
|
@@ -6,11 +6,6 @@ export declare class AppDeploymentFailedError extends BaseError {
|
|
|
6
6
|
constructor(userError?: boolean, requestId?: string | undefined, message?: string);
|
|
7
7
|
isUserError(): boolean;
|
|
8
8
|
}
|
|
9
|
-
export declare class AppSnapshotFailedError extends BaseError {
|
|
10
|
-
private readonly userError;
|
|
11
|
-
constructor(userError?: boolean, requestId?: string | undefined, message?: string);
|
|
12
|
-
isUserError(): boolean;
|
|
13
|
-
}
|
|
14
9
|
export declare class HostedResourceDeploymentFailedError extends BaseError {
|
|
15
10
|
private readonly userError;
|
|
16
11
|
constructor(userError?: boolean, requestId?: string | undefined, message?: string);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAIjB,mBAAmB,EAGnB,KAAK,EAEL,EAAE,EACF,SAAS,EAET,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAyB,MAAM,iCAAiC,CAAC;AAG7F,qBAAa,wBAAyB,SAAQ,SAAS;IAEnD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,mCAAoC,SAAQ,SAAS;IAE9D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AACD,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;CAG7D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,GAAE,OAAe,EAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,CAAC,EAAE,MAAM;IAIX,WAAW,IAAI,OAAO;CAG9B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CACJ,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAQD,qBAAa,gBAAiB,YAAW,QAAQ;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAJF,gBAAgB,EAAE,iBAAiB,EACnC,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,EAAE;IAGZ,MAAM,CACjB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,YAAY,CAAC,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;YAaF,QAAQ;IAkBT,kBAAkB,CAC7B,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM;;;;YA4BL,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,0BAA0B;IAqBlC,OAAO,CAAC,gBAAgB;CAuDzB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ArtifactDeployer = exports.ExistingInstallationsError = exports.ManifestValidationFailedError = exports.HostedResourceDeploymentFailedError = exports.
|
|
3
|
+
exports.ArtifactDeployer = exports.ExistingInstallationsError = exports.ManifestValidationFailedError = exports.HostedResourceDeploymentFailedError = exports.AppDeploymentFailedError = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
5
|
const DEPLOYMENT_EVENT_POLL_INTERVAL = 500;
|
|
6
6
|
class AppDeploymentFailedError extends cli_shared_1.BaseError {
|
|
@@ -14,17 +14,6 @@ class AppDeploymentFailedError extends cli_shared_1.BaseError {
|
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
exports.AppDeploymentFailedError = AppDeploymentFailedError;
|
|
17
|
-
class AppSnapshotFailedError extends cli_shared_1.BaseError {
|
|
18
|
-
userError;
|
|
19
|
-
constructor(userError = false, requestId, message) {
|
|
20
|
-
super(requestId, message);
|
|
21
|
-
this.userError = userError;
|
|
22
|
-
}
|
|
23
|
-
isUserError() {
|
|
24
|
-
return this.userError;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
exports.AppSnapshotFailedError = AppSnapshotFailedError;
|
|
28
17
|
class HostedResourceDeploymentFailedError extends cli_shared_1.BaseError {
|
|
29
18
|
userError;
|
|
30
19
|
constructor(userError = false, requestId, message) {
|
|
@@ -56,12 +45,6 @@ exports.ExistingInstallationsError = ExistingInstallationsError;
|
|
|
56
45
|
function isTransitionEvent(event) {
|
|
57
46
|
return event.__typename === 'AppDeploymentTransitionEvent';
|
|
58
47
|
}
|
|
59
|
-
function isSnapshotLogEvent(event) {
|
|
60
|
-
return event.__typename === 'AppDeploymentSnapshotLogEvent';
|
|
61
|
-
}
|
|
62
|
-
function isValidSnapshotLogEvent(event) {
|
|
63
|
-
return !!(event.message && event.level);
|
|
64
|
-
}
|
|
65
48
|
class ArtifactDeployer {
|
|
66
49
|
getConfiguredApp;
|
|
67
50
|
deployClient;
|
|
@@ -152,15 +135,6 @@ class ArtifactDeployer {
|
|
|
152
135
|
this.ui.info(cli_shared_1.Text.deploy.taskDeploy.serverStepStarted(event.stepName));
|
|
153
136
|
}
|
|
154
137
|
}
|
|
155
|
-
else if (isSnapshotLogEvent(event)) {
|
|
156
|
-
if (!addNewLineBetweenTransitions) {
|
|
157
|
-
this.ui.emptyLine();
|
|
158
|
-
addNewLineBetweenTransitions = true;
|
|
159
|
-
}
|
|
160
|
-
if (isValidSnapshotLogEvent(event)) {
|
|
161
|
-
this.ui.snapshotLog(event.message, event.level);
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
138
|
else if (event.message) {
|
|
165
139
|
this.ui.debug(event.message);
|
|
166
140
|
}
|
|
@@ -170,12 +144,6 @@ class ArtifactDeployer {
|
|
|
170
144
|
if (errorDetails) {
|
|
171
145
|
const { code, message } = errorDetails;
|
|
172
146
|
switch (code) {
|
|
173
|
-
case 'APP_CODE_SNAPSHOT_FAILED': {
|
|
174
|
-
throw new AppSnapshotFailedError(true, requestId, cli_shared_1.Text.snapshot.error('App code snapshot error', message));
|
|
175
|
-
}
|
|
176
|
-
case 'APP_CODE_SNAPSHOT_TIMEOUT': {
|
|
177
|
-
throw new AppSnapshotFailedError(false, requestId, cli_shared_1.Text.snapshot.timeout);
|
|
178
|
-
}
|
|
179
147
|
case 'ENVIRONMENT_UPDATE_VALIDATION_FAILED': {
|
|
180
148
|
const causeMessage = errorDetails?.fields?.validationResult.message.replace(/Upsert.*Error message: /, '');
|
|
181
149
|
if (causeMessage?.toLowerCase().includes('egress')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/archiver.ts"],"names":[],"mappings":";;AAKA,OAAO,EAAE,MAAM,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE5D,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,qBAAa,aAAc,SAAQ,SAAS;CAAG;AAE/C,qBAAa,WAAY,YAAW,QAAQ;IAM9B,OAAO,CAAC,QAAQ,CAAC,MAAM;IALnC,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;gBAErB,MAAM,EAAE,MAAM;IAapC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKjD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKrD,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIzC,OAAO,CAAC,cAAc,CAKpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH;AAED,qBAAa,iBAAkB,YAAW,QAAQ;IAE9C,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADf,SAAS,EAAE,MAAM,EACR,MAAM,EAAE,MAAM;IAG1B,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKjD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK5D,OAAO,CAAC,IAAI;IAcC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAGzC;AAED,qBAAa,aAAc,YAAW,QAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,QAAQ,EAAE;IAE3C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMjD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAM/C,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAIzC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAMrD"}
|
|
@@ -19,7 +19,4 @@ export declare class RuntimeBundler {
|
|
|
19
19
|
protected packageI18nResources(archiver: Archiver, i18nResourceBundle: I18nResourceBundle): void;
|
|
20
20
|
bundle(handlers: Handler[], i18nResourceBundle: I18nResourceBundle, packageConfig?: App['package']): Promise<RuntimeBundleResult>;
|
|
21
21
|
}
|
|
22
|
-
export declare class NodeRuntimeBundler extends RuntimeBundler {
|
|
23
|
-
protected packageAll(archiver: Archiver, handlers: Handler[], packageConfig: App['package'], i18nResourceBundle: I18nResourceBundle): Promise<string[]>;
|
|
24
|
-
}
|
|
25
22
|
//# sourceMappingURL=runtime-bundler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,UAAU,EAAkB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,EAEZ,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EACd,gBAAgB,EAAE,gBAAgB,EACpC,YAAY,EAAE,YAAY;cAG7B,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;cA4BJ,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,UAAU,EAAkB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,EAEZ,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EACd,gBAAgB,EAAE,gBAAgB,EACpC,YAAY,EAAE,YAAY;cAG7B,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;cA4BJ,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;IAepB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAMnF,MAAM,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC7B,OAAO,CAAC,mBAAmB,CAAC;CAgBhC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.RuntimeBundler = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
6
|
const bundler_1 = require("@forge/bundler");
|
|
@@ -56,6 +56,10 @@ class RuntimeBundler {
|
|
|
56
56
|
const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
|
|
57
57
|
const moduleList = await this.packageCode(archiver, entryPoints, i18nResourceBundle);
|
|
58
58
|
await this.packageDependencies(archiver);
|
|
59
|
+
const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
|
|
60
|
+
for (const fileName of files) {
|
|
61
|
+
archiver.addFileFrom(fileName, fileName);
|
|
62
|
+
}
|
|
59
63
|
return moduleList;
|
|
60
64
|
}
|
|
61
65
|
packageI18nResources(archiver, i18nResourceBundle) {
|
|
@@ -75,15 +79,4 @@ class RuntimeBundler {
|
|
|
75
79
|
}
|
|
76
80
|
}
|
|
77
81
|
exports.RuntimeBundler = RuntimeBundler;
|
|
78
|
-
class NodeRuntimeBundler extends RuntimeBundler {
|
|
79
|
-
async packageAll(archiver, handlers, packageConfig, i18nResourceBundle) {
|
|
80
|
-
const moduleList = await super.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
|
|
81
|
-
const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
|
|
82
|
-
for (const fileName of files) {
|
|
83
|
-
archiver.addFileFrom(fileName, fileName);
|
|
84
|
-
}
|
|
85
|
-
return moduleList;
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
exports.NodeRuntimeBundler = NodeRuntimeBundler;
|
|
89
82
|
//# sourceMappingURL=runtime-bundler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,8 @@ export declare enum DockerErrorCode {
|
|
|
11
11
|
}
|
|
12
12
|
export declare class DockerService {
|
|
13
13
|
verifyInstalled(): void;
|
|
14
|
-
runContainer(args: string[]): ReturnType<typeof spawn>;
|
|
15
14
|
authenticateDocker(args: string[]): ReturnType<typeof spawn>;
|
|
16
15
|
getDockerVersion(debugEnabled: boolean): Promise<string>;
|
|
17
|
-
removeContainer(containerName: string): Promise<void>;
|
|
18
|
-
downloadImage(imageName: string): ReturnType<typeof spawn>;
|
|
19
|
-
startCleanupWorker(pids: number[], containerName: string): void;
|
|
20
16
|
private execPromise;
|
|
21
17
|
}
|
|
22
18
|
//# sourceMappingURL=docker-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAQpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAOtD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBrE,OAAO,CAAC,WAAW;CAWpB"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DockerService = exports.DockerErrorCode = exports.DOCKER_DOWNLOAD_LINK = exports.DockerError = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
6
|
const command_exists_1 = tslib_1.__importDefault(require("command-exists"));
|
|
8
7
|
const cross_spawn_1 = require("cross-spawn");
|
|
9
8
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
@@ -27,10 +26,6 @@ class DockerService {
|
|
|
27
26
|
throw new DockerError(cli_shared_1.Text.tunnel.error.dockerNotInstalled(exports.DOCKER_DOWNLOAD_LINK), DockerErrorCode.NOT_INSTALLED);
|
|
28
27
|
}
|
|
29
28
|
}
|
|
30
|
-
runContainer(args) {
|
|
31
|
-
this.verifyInstalled();
|
|
32
|
-
return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: ['inherit', 'inherit', 'pipe'] });
|
|
33
|
-
}
|
|
34
29
|
authenticateDocker(args) {
|
|
35
30
|
this.verifyInstalled();
|
|
36
31
|
return (0, cross_spawn_1.spawn)('docker', ['login', ...args], {
|
|
@@ -46,27 +41,6 @@ class DockerService {
|
|
|
46
41
|
const dockerVersion = stdout.trim();
|
|
47
42
|
return dockerVersion;
|
|
48
43
|
}
|
|
49
|
-
async removeContainer(containerName) {
|
|
50
|
-
this.verifyInstalled();
|
|
51
|
-
await this.execPromise(`docker rm -f ${containerName}`);
|
|
52
|
-
}
|
|
53
|
-
downloadImage(imageName) {
|
|
54
|
-
this.verifyInstalled();
|
|
55
|
-
return (0, cross_spawn_1.spawn)('docker', ['pull', imageName], {
|
|
56
|
-
env: {
|
|
57
|
-
...process.env,
|
|
58
|
-
DOCKER_CLI_HINTS: '0'
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
startCleanupWorker(pids, containerName) {
|
|
63
|
-
const dockerCleanUp = (0, cross_spawn_1.spawn)(process.env.NODE_ENV === 'development' ? 'ts-node' : 'node', [path_1.default.join(__dirname, '../workers/tunnel-cleanup-worker')], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
|
64
|
-
const message = {
|
|
65
|
-
pids,
|
|
66
|
-
containers: [containerName]
|
|
67
|
-
};
|
|
68
|
-
dockerCleanUp.send(message);
|
|
69
|
-
}
|
|
70
44
|
execPromise(cmd) {
|
|
71
45
|
return new Promise((resolve) => {
|
|
72
46
|
(0, child_process_1.exec)(cmd, (err, stdout, stderr) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-service.js","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":";;;;AAAA,iDAAoD;
|
|
1
|
+
{"version":3,"file":"docker-service.js","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":";;;;AAAA,iDAAoD;AAEpD,4EAA2C;AAC3C,6CAAoC;AAEpC,kDAAoD;AAQpD,MAAa,WAAY,SAAQ,sBAAS;IAGtB;IAFlB,YACE,OAAe,EACC,IAAqB;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,SAAI,GAAJ,IAAI,CAAiB;IAGvC,CAAC;CACF;AAPD,kCAOC;AAEY,QAAA,oBAAoB,GAAG,qCAAqC,CAAC;AAE1E,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,iFAAkB,CAAA;IAClB,uEAAa,CAAA;AACf,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED,MAAa,aAAa;IACjB,eAAe;QACpB,IAAI,CAAC,wBAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,4BAAoB,CAAC,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;SAClH;IACH,CAAC;IAEM,kBAAkB,CAAC,IAAc;QACtC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;YACzC,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;SACtC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,YAAqB;QACjD,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,+CAA+C,CAAC,CAAC;QAEhG,IAAI,GAAG,EAAE;YACP,MAAM,IAAI,WAAW,CACnB,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,EACnE,eAAe,CAAC,kBAAkB,CACnC,CAAC;SACH;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpC,OAAO,aAAa,CAAC;IACvB,CAAC;IAGO,WAAW,CAAC,GAAW;QAC7B,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,EAAE;YAChD,IAAA,oBAAI,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAChC,OAAO,CAAC;oBACN,GAAG,EAAE,GAAG;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzCD,sCAyCC"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
|
|
2
2
|
import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
|
|
3
|
-
import { DownloadProgressCallbacks } from '../command-line/view/tunnel-view';
|
|
4
3
|
export declare class TunnelAnalyticsService {
|
|
5
4
|
private readonly analyticsClientReporter;
|
|
6
5
|
private readonly cliDetails;
|
|
7
6
|
constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
|
|
8
|
-
reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
|
|
9
|
-
reportTunnelClosed(creds: PersonalApiCredentialsValidated): void;
|
|
10
7
|
reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
|
|
11
8
|
[key: string]: any;
|
|
12
9
|
}): Promise<void>;
|
|
13
|
-
getImageDownloadReporters(creds: PersonalApiCredentialsValidated): DownloadProgressCallbacks;
|
|
14
10
|
}
|
|
15
11
|
//# sourceMappingURL=tunnel-analytics-service.d.ts.map
|
|
@@ -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,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;CAgBrC"}
|
|
@@ -9,14 +9,6 @@ class TunnelAnalyticsService {
|
|
|
9
9
|
this.analyticsClientReporter = analyticsClientReporter;
|
|
10
10
|
this.cliDetails = cliDetails;
|
|
11
11
|
}
|
|
12
|
-
reportDockerVersion(creds, dockerVersion) {
|
|
13
|
-
this.analyticsClientReporter.reportSuccess('docker version check', creds, {
|
|
14
|
-
dockerVersion
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
reportTunnelClosed(creds) {
|
|
18
|
-
this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
|
|
19
|
-
}
|
|
20
12
|
async reportTunnelFailure(creds, errorName, attributes) {
|
|
21
13
|
attributes = {
|
|
22
14
|
error: errorName,
|
|
@@ -31,13 +23,6 @@ class TunnelAnalyticsService {
|
|
|
31
23
|
}
|
|
32
24
|
this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
|
|
33
25
|
}
|
|
34
|
-
getImageDownloadReporters(creds) {
|
|
35
|
-
return {
|
|
36
|
-
onStart: () => this.analyticsClientReporter.reportSuccess('image download started', creds, {}),
|
|
37
|
-
onFailure: () => this.analyticsClientReporter.reportSuccess('image download failed', creds, {}),
|
|
38
|
-
onSuccess: () => this.analyticsClientReporter.reportSuccess('image download finished', creds, {})
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
26
|
}
|
|
42
27
|
exports.TunnelAnalyticsService = TunnelAnalyticsService;
|
|
43
28
|
//# sourceMappingURL=tunnel-analytics-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;
|
|
1
|
+
{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AAGpG,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAC9B,KAAsC,EACtC,SAAiB,EACjB,UAAkC;QAElC,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;CACF;AAzBD,wDAyBC"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { PersonalApiCredentials, PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
|
|
1
|
+
import { PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
|
|
3
2
|
import { StartTunnelCommand, TunnelInteractor } from '@forge/tunnel';
|
|
4
3
|
import { CachedConfigService } from './cached-config-service';
|
|
5
|
-
import { DockerService } from './docker-service';
|
|
6
4
|
import { ConfigFilePortFindingService } from './port-finding-service';
|
|
7
5
|
import { TunnelAnalyticsService } from './tunnel-analytics-service';
|
|
8
|
-
export declare const CONTAINER_NAME: string;
|
|
9
|
-
export declare const IMAGE_NAME: string;
|
|
10
6
|
export declare type TunnelService = {
|
|
11
7
|
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
|
|
12
8
|
};
|
|
@@ -33,36 +29,5 @@ export declare class InProcessTunnelService extends TunnelServiceBase {
|
|
|
33
29
|
constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService);
|
|
34
30
|
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
|
|
35
31
|
}
|
|
36
|
-
interface EnvironmentVariable {
|
|
37
|
-
key: string;
|
|
38
|
-
value: string;
|
|
39
|
-
}
|
|
40
|
-
declare abstract class SandboxTunnelServiceBase extends TunnelServiceBase {
|
|
41
|
-
protected readonly configFilePortFindingService: ConfigFilePortFindingService;
|
|
42
|
-
protected readonly cachedConfigService: CachedConfigService;
|
|
43
|
-
constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService);
|
|
44
|
-
getTunnelProcessEnvironment(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials, port: number, cspReporterPort: number | undefined, resourcePorts: Record<string, number>): Promise<EnvironmentVariable[]>;
|
|
45
|
-
private getInspectorPortEnvironment;
|
|
46
|
-
private getCspReporterPortEnvironment;
|
|
47
|
-
private getResourcePortEnvironment;
|
|
48
|
-
private getUserEnvironmentVariables;
|
|
49
|
-
}
|
|
50
|
-
export declare class LocalTunnelService extends SandboxTunnelServiceBase {
|
|
51
|
-
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
|
|
52
|
-
private formatEnvForLocalTunnel;
|
|
53
|
-
}
|
|
54
|
-
export declare class DockerTunnelService extends SandboxTunnelServiceBase {
|
|
55
|
-
private readonly dockerService;
|
|
56
|
-
private readonly analyticsService;
|
|
57
|
-
constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
|
|
58
|
-
run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
|
|
59
|
-
bootstrapDocker(): Promise<ReturnType<typeof spawn> | undefined>;
|
|
60
|
-
private validateDockerVersion;
|
|
61
|
-
private getDockerPortOptions;
|
|
62
|
-
private formatEnvForDocker;
|
|
63
|
-
private getInteractiveOptions;
|
|
64
|
-
private getVolumeOptions;
|
|
65
|
-
private getCommonOptions;
|
|
66
|
-
}
|
|
67
32
|
export {};
|
|
68
33
|
//# sourceMappingURL=tunnel-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,+BAA+B,EAE/B,aAAa,EACb,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CACD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,uBAAe,iBAAkB,YAAW,aAAa;IAC3C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;gBAAxC,mBAAmB,EAAE,mBAAmB;aAEvD,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CACjB;AAaD,qBAAa,sBAAuB,SAAQ,iBAAiB;IAEzD,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBALhB,EAAE,EAAE,EAAE,EACN,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B,EAC3E,mBAAmB,EAAE,mBAAmB,EACvB,gBAAgB,EAAE,sBAAsB;IAK9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CAsBjB"}
|