@forge/tunnel 6.3.9-next.8 → 6.3.9
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 +59 -0
- package/out/command/interactors/tunnel-interactor.d.ts +7 -1
- package/out/command/interactors/tunnel-interactor.d.ts.map +1 -1
- package/out/command/interactors/tunnel-interactor.js +26 -1
- package/out/servers/resource-tunnel-server.d.ts +3 -4
- package/out/servers/resource-tunnel-server.d.ts.map +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,64 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
+
## 6.3.9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- a684b69: Refactor the order of starting the containers docker compose stack, to lint the manifest first
|
|
8
|
+
- Updated dependencies [2b94ed8]
|
|
9
|
+
- Updated dependencies [c1526eb]
|
|
10
|
+
- Updated dependencies [475f9a7]
|
|
11
|
+
- Updated dependencies [19807bf]
|
|
12
|
+
- Updated dependencies [a684b69]
|
|
13
|
+
- Updated dependencies [63d29ca]
|
|
14
|
+
- Updated dependencies [2719ab7]
|
|
15
|
+
- @forge/cli-shared@8.15.1
|
|
16
|
+
- @forge/bundler@6.1.18
|
|
17
|
+
|
|
18
|
+
## 6.3.9-next.14
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- @forge/bundler@6.1.18-next.14
|
|
23
|
+
- @forge/cli-shared@8.15.1-next.12
|
|
24
|
+
|
|
25
|
+
## 6.3.9-next.13
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- @forge/bundler@6.1.18-next.13
|
|
30
|
+
- @forge/cli-shared@8.15.1-next.11
|
|
31
|
+
|
|
32
|
+
## 6.3.9-next.12
|
|
33
|
+
|
|
34
|
+
### Patch Changes
|
|
35
|
+
|
|
36
|
+
- Updated dependencies [63d29ca]
|
|
37
|
+
- @forge/cli-shared@8.15.1-next.10
|
|
38
|
+
- @forge/bundler@6.1.18-next.12
|
|
39
|
+
|
|
40
|
+
## 6.3.9-next.11
|
|
41
|
+
|
|
42
|
+
### Patch Changes
|
|
43
|
+
|
|
44
|
+
- a684b69: Refactor the order of starting the containers docker compose stack, to lint the manifest first
|
|
45
|
+
- Updated dependencies [a684b69]
|
|
46
|
+
- @forge/cli-shared@8.15.1-next.9
|
|
47
|
+
- @forge/bundler@6.1.18-next.11
|
|
48
|
+
|
|
49
|
+
## 6.3.9-next.10
|
|
50
|
+
|
|
51
|
+
### Patch Changes
|
|
52
|
+
|
|
53
|
+
- @forge/bundler@6.1.18-next.10
|
|
54
|
+
- @forge/cli-shared@8.15.1-next.8
|
|
55
|
+
|
|
56
|
+
## 6.3.9-next.9
|
|
57
|
+
|
|
58
|
+
### Patch Changes
|
|
59
|
+
|
|
60
|
+
- @forge/bundler@6.1.18-next.9
|
|
61
|
+
|
|
3
62
|
## 6.3.9-next.8
|
|
4
63
|
|
|
5
64
|
### Patch Changes
|
|
@@ -1,11 +1,17 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
1
2
|
import { WatcherMonitor } from '@forge/bundler';
|
|
2
3
|
import { Logger, TunnelOptions, StatsigService } from '@forge/cli-shared';
|
|
4
|
+
import { ChildProcess } from 'child_process';
|
|
3
5
|
import { StartTunnelResult } from '../start-tunnel-command';
|
|
4
6
|
import chokidar, { FSWatcher } from 'chokidar';
|
|
7
|
+
export interface DockerAuthenticator {
|
|
8
|
+
authenticateDocker(): Promise<ChildProcess>;
|
|
9
|
+
}
|
|
5
10
|
export declare class TunnelInteractor {
|
|
6
11
|
private readonly logger;
|
|
12
|
+
private readonly dockerAuthenticator;
|
|
7
13
|
private readonly statsigService;
|
|
8
|
-
constructor(logger: Logger, statsigService: StatsigService);
|
|
14
|
+
constructor(logger: Logger, statsigService: StatsigService, dockerAuthenticator: DockerAuthenticator);
|
|
9
15
|
private logTunnelStatus;
|
|
10
16
|
handleUserExitEvent(stopFunction: () => Promise<void>, bundleMonitor: WatcherMonitor | undefined, manifestFileWatcher: FSWatcher): Promise<void>;
|
|
11
17
|
watchAndWarnOnManifestChanges(manifestFilePath: string): chokidar.FSWatcher;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":";AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAGL,MAAM,EAEN,aAAa,EACb,cAAc,EAIf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;CAC7C;AAED,qBAAa,gBAAgB;IAGzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAJtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,MAAM,EAAE,MAAM,EAC/B,cAAc,EAAE,cAAc,EACb,mBAAmB,EAAE,mBAAmB;IAK3D,OAAO,CAAC,eAAe;IAShB,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CAqFpC;CACH"}
|
|
@@ -10,9 +10,11 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
|
10
10
|
const chokidar_1 = tslib_1.__importDefault(require("chokidar"));
|
|
11
11
|
class TunnelInteractor {
|
|
12
12
|
logger;
|
|
13
|
+
dockerAuthenticator;
|
|
13
14
|
statsigService;
|
|
14
|
-
constructor(logger, statsigService) {
|
|
15
|
+
constructor(logger, statsigService, dockerAuthenticator) {
|
|
15
16
|
this.logger = logger;
|
|
17
|
+
this.dockerAuthenticator = dockerAuthenticator;
|
|
16
18
|
this.statsigService = statsigService;
|
|
17
19
|
}
|
|
18
20
|
logTunnelStatus(localPort, tunnelOptions) {
|
|
@@ -87,6 +89,29 @@ class TunnelInteractor {
|
|
|
87
89
|
if (tunnelOptions.verify) {
|
|
88
90
|
await (0, bundler_1.runLinter)(this.statsigService);
|
|
89
91
|
}
|
|
92
|
+
if (tunnelOptions.containersDockerComposeFiles) {
|
|
93
|
+
try {
|
|
94
|
+
if (this.dockerAuthenticator) {
|
|
95
|
+
this.logger.info('');
|
|
96
|
+
this.logger.info(cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.tunnel.authenticatingDocker));
|
|
97
|
+
const childProcess = await this.dockerAuthenticator.authenticateDocker();
|
|
98
|
+
await (0, cli_shared_1.processDockerAuthentication)(childProcess);
|
|
99
|
+
}
|
|
100
|
+
for (const [serviceKey, filePath] of Object.entries(tunnelOptions.containersDockerComposeFiles)) {
|
|
101
|
+
this.logger.info('');
|
|
102
|
+
this.logger.info(cli_shared_1.Text.tunnel.startingContainerService(serviceKey));
|
|
103
|
+
await (0, cli_shared_1.startDockerComposeStack)(filePath, serviceKey);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
this.logger.error(new Error(cli_shared_1.Text.tunnel.error.unableToStartContainerServices));
|
|
108
|
+
for (const filePath of Object.values(tunnelOptions.containersDockerComposeFiles)) {
|
|
109
|
+
await (0, cli_shared_1.deleteDockerComposeFile)(filePath);
|
|
110
|
+
}
|
|
111
|
+
throw err;
|
|
112
|
+
}
|
|
113
|
+
this.logger.info('');
|
|
114
|
+
}
|
|
90
115
|
this.logger.info(cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.tunnel.bundlingHeader));
|
|
91
116
|
try {
|
|
92
117
|
const output = await multiCompiler.compileAndWatch({
|
|
@@ -34,12 +34,11 @@ export declare abstract class ResourceTunnelServer {
|
|
|
34
34
|
media?: import("@forge/manifest").Media | undefined;
|
|
35
35
|
scripts?: import("@forge/manifest").Scripts1 | undefined;
|
|
36
36
|
styles?: import("@forge/manifest").Styles1 | undefined;
|
|
37
|
+
configurable?: {
|
|
38
|
+
enabled: boolean;
|
|
39
|
+
} | undefined;
|
|
37
40
|
};
|
|
38
41
|
enforcement?: "app-managed" | undefined;
|
|
39
|
-
configurable?: {
|
|
40
|
-
[k: string]: unknown;
|
|
41
|
-
enabled: boolean;
|
|
42
|
-
} | undefined;
|
|
43
42
|
scopes?: import("@forge/manifest").Scopes | undefined;
|
|
44
43
|
content?: import("@forge/manifest").Content1 | undefined;
|
|
45
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/resource-tunnel-server.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,EAMR,MAAM,EAGP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA6C,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAQxF,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/resource-tunnel-server.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,EAMR,MAAM,EAGP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA6C,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,YAAY,CAAC;CAC3B;AAED,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAQxF,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;IAejF,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAMvF,SAAS,CAAC,YAAY,gBAAiB,UAAU,aAAa,MAAM,KAAG,MAAM,CAQ7D;IAEhB,SAAS,CAAC,wBAAwB,gBAAiB,MAAM,YAGpD;IAEL,SAAS,CAAC,yBAAyB,gBAAiB,MAAM,YAGrD;IAEL,SAAS,CAAC,kCAAkC,gBAAiB,WAAW,uBAAqB,cAAc,CAwBpG;IAEP,SAAS,CAAC,0BAA0B,eAAgB,YAAY,WAI3C,OAAO,QAAQ,QAAQ,QAAQ,YAAY,mBAU9D;CACH"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "6.3.9
|
|
3
|
+
"version": "6.3.9",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "6.1.18
|
|
15
|
-
"@forge/cli-shared": "8.15.1
|
|
14
|
+
"@forge/bundler": "6.1.18",
|
|
15
|
+
"@forge/cli-shared": "8.15.1",
|
|
16
16
|
"@forge/csp": "5.6.1",
|
|
17
17
|
"@forge/runtime": "6.1.2",
|
|
18
18
|
"@forge/util": "^2.0.1",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@atlassian/xen-test-util": "^4.2.0",
|
|
36
|
-
"@forge/manifest": "12.1.0
|
|
36
|
+
"@forge/manifest": "12.1.0",
|
|
37
37
|
"@types/express": "^4.17.21",
|
|
38
38
|
"@types/jest": "^29.5.14",
|
|
39
39
|
"@types/node": "20.19.1",
|