@forge/tunnel 6.3.2-next.0 → 6.3.2-next.2
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
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
+
## 6.3.2-next.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [debdb02]
|
|
8
|
+
- @forge/csp@5.3.0-next.0
|
|
9
|
+
- @forge/bundler@6.1.11-next.2
|
|
10
|
+
|
|
11
|
+
## 6.3.2-next.1
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- aaf8a03: forge tunnel with containers: delete auto generated docker compose files upon failing to startup
|
|
16
|
+
- Updated dependencies [aaf8a03]
|
|
17
|
+
- @forge/cli-shared@8.8.2-next.1
|
|
18
|
+
- @forge/bundler@6.1.11-next.1
|
|
19
|
+
|
|
3
20
|
## 6.3.2-next.0
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -33,8 +33,6 @@ export declare class StartTunnelCommand {
|
|
|
33
33
|
private validateTunnelUrl;
|
|
34
34
|
private validateTunnelPort;
|
|
35
35
|
private stopServices;
|
|
36
|
-
stopDockerComposeStack: (composeFiles?: Record<string, string>) => Promise<void>;
|
|
37
|
-
private deleteDockerComposeFile;
|
|
38
36
|
private startFaaSTunnelServer;
|
|
39
37
|
private startResourceBasedTunnelsServers;
|
|
40
38
|
execute(options: StartTunnelOptions, containersDockerComposeFiles?: Record<string, string>): Promise<StartTunnelResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../src/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,MAAM,EAEN,aAAa,
|
|
1
|
+
{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../src/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACL,iBAAiB,EACjB,UAAU,EACV,MAAM,EAEN,aAAa,EAKd,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1F;AAQD,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAV7B,OAAO,CAAC,aAAa,CAAmE;IACxF,OAAO,CAAC,iBAAiB,CAAgC;gBAGtC,YAAY,EAAE,iBAAiB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,mBAAmB,EAClC,YAAY,EAAE,qBAAqB,EACnC,YAAY,EAAE,qBAAqB,EACnC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,YAAY,CAclB;IAEF,OAAO,CAAC,qBAAqB,CA+B3B;IAEF,OAAO,CAAC,gCAAgC,CAiCtC;IAEW,OAAO,CAClB,OAAO,EAAE,kBAAkB,EAC3B,4BAA4B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpD,OAAO,CAAC,iBAAiB,CAAC;CA0D9B"}
|
|
@@ -6,9 +6,6 @@ const cli_shared_1 = require("@forge/cli-shared");
|
|
|
6
6
|
const node_cache_1 = tslib_1.__importDefault(require("node-cache"));
|
|
7
7
|
const portfinder_1 = require("portfinder");
|
|
8
8
|
const servers_1 = require("../servers");
|
|
9
|
-
const docker_compose_1 = require("docker-compose");
|
|
10
|
-
const path = tslib_1.__importStar(require("path"));
|
|
11
|
-
const fs = tslib_1.__importStar(require("fs"));
|
|
12
9
|
class InvalidTunnelConfigError extends cli_shared_1.UserError {
|
|
13
10
|
constructor(message) {
|
|
14
11
|
super(message);
|
|
@@ -64,40 +61,9 @@ class StartTunnelCommand {
|
|
|
64
61
|
this.devServer.stop(),
|
|
65
62
|
...Object.values(this.tunnelServers).map((server) => server.stop()),
|
|
66
63
|
this.cspReporterServer?.stop(),
|
|
67
|
-
|
|
64
|
+
(0, cli_shared_1.stopDockerComposeStack)(this.configFile, containersDockerComposeFiles)
|
|
68
65
|
]);
|
|
69
66
|
};
|
|
70
|
-
stopDockerComposeStack = async (composeFiles) => {
|
|
71
|
-
if (!composeFiles || Object.keys(composeFiles).length === 0)
|
|
72
|
-
return;
|
|
73
|
-
const { services } = await this.configFile.readConfig();
|
|
74
|
-
const serviceWithTunnelConfigExists = services?.some((service) => service.containers?.some((container) => {
|
|
75
|
-
return !!container.tunnel;
|
|
76
|
-
}));
|
|
77
|
-
if (!services || services.length === 0 || !serviceWithTunnelConfigExists)
|
|
78
|
-
return;
|
|
79
|
-
await Promise.all(Object.entries(composeFiles).map(async ([serviceKey, file]) => {
|
|
80
|
-
try {
|
|
81
|
-
await (0, docker_compose_1.downAll)({ cwd: '.', log: true, config: file, composeOptions: [`-p${serviceKey}`] });
|
|
82
|
-
await this.deleteDockerComposeFile(file);
|
|
83
|
-
}
|
|
84
|
-
catch (err) {
|
|
85
|
-
throw new Error(cli_shared_1.Text.tunnel.unableToStopDockerComposeStack(serviceKey, err.message ?? 'Unknown Error Occurred.'));
|
|
86
|
-
}
|
|
87
|
-
}));
|
|
88
|
-
};
|
|
89
|
-
deleteDockerComposeFile = async (composeFile) => {
|
|
90
|
-
if (fs.existsSync(composeFile)) {
|
|
91
|
-
fs.unlinkSync(composeFile);
|
|
92
|
-
}
|
|
93
|
-
const hiddenDir = path.join(process.cwd(), '.services');
|
|
94
|
-
if (fs.existsSync(hiddenDir)) {
|
|
95
|
-
const files = fs.readdirSync(hiddenDir);
|
|
96
|
-
if (files.length == 0) {
|
|
97
|
-
fs.rmdirSync(hiddenDir);
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
};
|
|
101
67
|
startFaaSTunnelServer = async ({ port, appId, environmentKey, tunnelUrl }) => {
|
|
102
68
|
const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
|
|
103
69
|
const serverInfo = await this.devServer.start(port, permissions, remotes);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "6.3.2-next.
|
|
3
|
+
"version": "6.3.2-next.2",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -11,9 +11,9 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "6.1.11-next.
|
|
15
|
-
"@forge/cli-shared": "8.8.2-next.
|
|
16
|
-
"@forge/csp": "5.
|
|
14
|
+
"@forge/bundler": "6.1.11-next.2",
|
|
15
|
+
"@forge/cli-shared": "8.8.2-next.1",
|
|
16
|
+
"@forge/csp": "5.3.0-next.0",
|
|
17
17
|
"@forge/runtime": "6.1.1",
|
|
18
18
|
"@forge/util": "^2.0.1",
|
|
19
19
|
"cheerio": "^1.1.0",
|