@forge/tunnel 5.4.0-next.1 → 5.4.0-next.10
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,72 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
+
## 5.4.0-next.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- @forge/cli-shared@5.4.0-next.8
|
|
8
|
+
- @forge/bundler@4.18.0-next.9
|
|
9
|
+
|
|
10
|
+
## 5.4.0-next.9
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- @forge/cli-shared@5.4.0-next.7
|
|
15
|
+
- @forge/bundler@4.18.0-next.8
|
|
16
|
+
|
|
17
|
+
## 5.4.0-next.8
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- Updated dependencies [694a970]
|
|
22
|
+
- @forge/cli-shared@5.4.0-next.6
|
|
23
|
+
- @forge/bundler@4.18.0-next.7
|
|
24
|
+
|
|
25
|
+
## 5.4.0-next.7
|
|
26
|
+
|
|
27
|
+
### Patch Changes
|
|
28
|
+
|
|
29
|
+
- Updated dependencies [4117f97]
|
|
30
|
+
- @forge/cli-shared@5.4.0-next.5
|
|
31
|
+
- @forge/bundler@4.18.0-next.6
|
|
32
|
+
- @forge/csp@3.3.0-next.0
|
|
33
|
+
|
|
34
|
+
## 5.4.0-next.6
|
|
35
|
+
|
|
36
|
+
### Patch Changes
|
|
37
|
+
|
|
38
|
+
- Updated dependencies [6c9b381]
|
|
39
|
+
- Updated dependencies [eaa03f9]
|
|
40
|
+
- @forge/bundler@4.17.6-next.5
|
|
41
|
+
|
|
42
|
+
## 5.4.0-next.5
|
|
43
|
+
|
|
44
|
+
### Patch Changes
|
|
45
|
+
|
|
46
|
+
- @forge/cli-shared@5.4.0-next.4
|
|
47
|
+
- @forge/bundler@4.17.6-next.4
|
|
48
|
+
|
|
49
|
+
## 5.4.0-next.4
|
|
50
|
+
|
|
51
|
+
### Minor Changes
|
|
52
|
+
|
|
53
|
+
- fd7827d: User Error handling for ports already in use
|
|
54
|
+
|
|
55
|
+
## 5.4.0-next.3
|
|
56
|
+
|
|
57
|
+
### Patch Changes
|
|
58
|
+
|
|
59
|
+
- Updated dependencies [84550d3]
|
|
60
|
+
- @forge/cli-shared@5.4.0-next.3
|
|
61
|
+
- @forge/bundler@4.17.6-next.3
|
|
62
|
+
|
|
63
|
+
## 5.4.0-next.2
|
|
64
|
+
|
|
65
|
+
### Patch Changes
|
|
66
|
+
|
|
67
|
+
- @forge/cli-shared@5.4.0-next.2
|
|
68
|
+
- @forge/bundler@4.17.6-next.2
|
|
69
|
+
|
|
3
70
|
## 5.4.0-next.1
|
|
4
71
|
|
|
5
72
|
### Patch Changes
|
|
@@ -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,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAyB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;
|
|
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,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAyB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAI9D,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAsC,iBAAiB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED,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,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAX7B,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,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CAUlB;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAwD9E"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
6
6
|
const runtime_1 = require("@forge/runtime");
|
|
7
7
|
const node_cache_1 = tslib_1.__importDefault(require("node-cache"));
|
|
8
|
+
const portfinder_1 = require("portfinder");
|
|
8
9
|
const servers_1 = require("../servers");
|
|
9
10
|
const index_1 = require("../index");
|
|
10
11
|
class StartTunnelCommand {
|
|
@@ -57,7 +58,8 @@ class StartTunnelCommand {
|
|
|
57
58
|
startResourceBasedTunnelsServers = async (resourceDetails, options) => {
|
|
58
59
|
const portMap = options.resourcePortMap ?? JSON.parse(process.env.RESOURCE_PORT_MAP ?? '{}');
|
|
59
60
|
const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
|
|
60
|
-
const
|
|
61
|
+
const availablePort = await (0, portfinder_1.getPortPromise)({ port: 4000 });
|
|
62
|
+
const cspReporterPort = process.env.CSP_REPORTER_PORT ? parseInt(process.env.CSP_REPORTER_PORT, 10) : availablePort;
|
|
61
63
|
if (resourceDetails.length === 0)
|
|
62
64
|
return [];
|
|
63
65
|
this.cspReporterServer = new servers_1.CspReporterServer(cspReporterPort, this.logger, new node_cache_1.default());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csp-reporter-server.d.ts","sourceRoot":"","sources":["../../src/servers/csp-reporter-server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"csp-reporter-server.d.ts","sourceRoot":"","sources":["../../src/servers/csp-reporter-server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAE5D,OAAO,SAAS,MAAM,YAAY,CAAC;AAYnC,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAM;gBAGhB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS;IAwBnC,MAAM,IAAI,OAAO;IAIX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}
|
|
@@ -36,7 +36,15 @@ class CspReporterServer {
|
|
|
36
36
|
async start() {
|
|
37
37
|
return new Promise((resolve, reject) => {
|
|
38
38
|
this.server = this.app.listen(this.port, resolve);
|
|
39
|
-
this.server.on('error',
|
|
39
|
+
this.server.on('error', (err) => {
|
|
40
|
+
const error = err;
|
|
41
|
+
if (error.code === 'EADDRINUSE') {
|
|
42
|
+
reject(new cli_shared_1.UserError(`Port ${this.port} is already in use. Please select a different port by setting the CSP_REPORTER_PORT environment variable`));
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
reject(err);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
40
48
|
});
|
|
41
49
|
}
|
|
42
50
|
async stop() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "5.4.0-next.
|
|
3
|
+
"version": "5.4.0-next.10",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -11,9 +11,9 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "4.
|
|
15
|
-
"@forge/cli-shared": "5.4.0-next.
|
|
16
|
-
"@forge/csp": "3.
|
|
14
|
+
"@forge/bundler": "4.18.0-next.9",
|
|
15
|
+
"@forge/cli-shared": "5.4.0-next.8",
|
|
16
|
+
"@forge/csp": "3.3.0-next.0",
|
|
17
17
|
"@forge/runtime": "5.10.1",
|
|
18
18
|
"chokidar": "^3.6.0",
|
|
19
19
|
"cloudflared": "^0.5.2",
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
"express-intercept": "^1.1.0",
|
|
22
22
|
"http-proxy-middleware": "^2.0.6",
|
|
23
23
|
"node-cache": "^5.1.2",
|
|
24
|
+
"portfinder": "^1.0.32",
|
|
24
25
|
"tmp": "^0.2.3",
|
|
25
26
|
"tslib": "^2.6.2",
|
|
26
27
|
"uuid": "^9.0.1",
|
|
@@ -28,7 +29,7 @@
|
|
|
28
29
|
},
|
|
29
30
|
"devDependencies": {
|
|
30
31
|
"@atlassian/xen-test-util": "^4.2.0",
|
|
31
|
-
"@forge/manifest": "7.
|
|
32
|
+
"@forge/manifest": "7.6.0-next.5",
|
|
32
33
|
"@types/express": "^4.17.21",
|
|
33
34
|
"@types/jest": "^29.5.12",
|
|
34
35
|
"@types/node": "14.18.63",
|