@forge/tunnel 6.1.3-next.3-experimental-3ed5db1 → 6.2.0-next.4-experimental-4baeb60
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,16 +1,37 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
-
## 6.
|
|
3
|
+
## 6.2.0-next.4-experimental-4baeb60
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- f5d312b: Add support for docker-compose file generation for containers tunnelling
|
|
4
8
|
|
|
5
9
|
### Patch Changes
|
|
6
10
|
|
|
7
11
|
- 895d478: Updates Agent MD file with appropriate instructions
|
|
8
12
|
- Updated dependencies [895d478]
|
|
9
13
|
- Updated dependencies [c343935]
|
|
14
|
+
- Updated dependencies [504cd62]
|
|
10
15
|
- Updated dependencies [5f384d1]
|
|
11
|
-
|
|
12
|
-
- @forge/
|
|
13
|
-
- @forge/
|
|
16
|
+
- Updated dependencies [f5d312b]
|
|
17
|
+
- @forge/cli-shared@8.7.0-next.4-experimental-4baeb60
|
|
18
|
+
- @forge/bundler@6.1.7-next.4-experimental-4baeb60
|
|
19
|
+
- @forge/csp@5.0.2-next.0-experimental-4baeb60
|
|
20
|
+
- @forge/runtime@6.0.4-next.0-experimental-4baeb60
|
|
21
|
+
|
|
22
|
+
## 6.2.0-next.4
|
|
23
|
+
|
|
24
|
+
### Minor Changes
|
|
25
|
+
|
|
26
|
+
- f5d312b: Add support for docker-compose file generation for containers tunnelling
|
|
27
|
+
|
|
28
|
+
### Patch Changes
|
|
29
|
+
|
|
30
|
+
- Updated dependencies [504cd62]
|
|
31
|
+
- Updated dependencies [f5d312b]
|
|
32
|
+
- @forge/bundler@6.1.7-next.4
|
|
33
|
+
- @forge/runtime@6.0.4-next.0
|
|
34
|
+
- @forge/cli-shared@8.7.0-next.4
|
|
14
35
|
|
|
15
36
|
## 6.1.3-next.3
|
|
16
37
|
|
|
@@ -41,6 +41,5 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
|
|
|
41
41
|
getApp(): express.Application;
|
|
42
42
|
handleInvocation: express.Handler;
|
|
43
43
|
configureProxyMiddleware: express.Handler;
|
|
44
|
-
private getServicePort;
|
|
45
44
|
}
|
|
46
45
|
//# sourceMappingURL=dev-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAKL,YAAY,EACZ,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EAEV,gBAAgB,EAChB,2BAA2B,EAC3B,MAAM,EACN,cAAc,EAEd,aAAa,
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAKL,YAAY,EACZ,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EAEV,gBAAgB,EAChB,2BAA2B,EAC3B,MAAM,EACN,cAAc,EAEd,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAKvD,MAAM,WAAW,gBAAiB,SAAQ,KAAK;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAClG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,iBAAiB,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACrE;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ/E;AAED,qBAAa,sBAAuB,YAAW,iBAAiB;IAK5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,2BAA2B;IAT9C,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;gBAGzB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EAC9B,2BAA2B,EAAE,2BAA2B;IAe9D,KAAK,CAAC,IAAI,SAAI,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAY9F,IAAI;IAIJ,eAAe,CAC1B,KAAK,EAAE,YAAY,EACnB,aAAa,GAAE,aAA2C,GACzD,OAAO,CAAC,aAAa,CAAC;IA+BlB,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CA4BtC;IAEK,wBAAwB,EAAE,OAAO,CAAC,OAAO,CAkC9C;CACH"}
|
|
@@ -8,7 +8,6 @@ const cli_shared_1 = require("@forge/cli-shared");
|
|
|
8
8
|
const runtime_1 = require("@forge/runtime");
|
|
9
9
|
const util_1 = require("../util");
|
|
10
10
|
const http_proxy_middleware_1 = require("http-proxy-middleware");
|
|
11
|
-
const DEFAULT_FORGE_SERVICE_PORT = 7071;
|
|
12
11
|
async function stopServer(server) {
|
|
13
12
|
if (!server) {
|
|
14
13
|
return;
|
|
@@ -102,9 +101,10 @@ class LocalDevelopmentServer {
|
|
|
102
101
|
};
|
|
103
102
|
configureProxyMiddleware = async (req, res, next) => {
|
|
104
103
|
const serviceKey = req.originalUrl.match(/^\/forge\/(.*)--.*\/.*/)?.[1];
|
|
105
|
-
const
|
|
104
|
+
const { services } = await this.configFile.readConfig();
|
|
105
|
+
const port = await (0, cli_shared_1.getServicePort)(services, serviceKey);
|
|
106
106
|
if (!port || port < 1024 || port > 49152) {
|
|
107
|
-
this.logger.error(new Error(
|
|
107
|
+
this.logger.error(new Error(cli_shared_1.Text.error.invalidServicePort(serviceKey ?? '')));
|
|
108
108
|
return;
|
|
109
109
|
}
|
|
110
110
|
(0, http_proxy_middleware_1.createProxyMiddleware)({
|
|
@@ -130,15 +130,5 @@ class LocalDevelopmentServer {
|
|
|
130
130
|
}
|
|
131
131
|
})(req, res, next);
|
|
132
132
|
};
|
|
133
|
-
async getServicePort(serviceKey) {
|
|
134
|
-
if (serviceKey) {
|
|
135
|
-
const { services } = await this.configFile.readConfig();
|
|
136
|
-
if (services) {
|
|
137
|
-
const defaultPort = services[0].tunnel?.port ?? DEFAULT_FORGE_SERVICE_PORT;
|
|
138
|
-
const index = services.findIndex((service) => service.key === serviceKey);
|
|
139
|
-
return services[index].tunnel?.port ?? defaultPort + index;
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
133
|
}
|
|
144
134
|
exports.LocalDevelopmentServer = LocalDevelopmentServer;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0-next.4-experimental-4baeb60",
|
|
4
4
|
"description": "Tunnel functionality for Forge CLI",
|
|
5
5
|
"author": "Atlassian",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
@@ -11,10 +11,10 @@
|
|
|
11
11
|
"compile": "tsc -b -v"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@forge/bundler": "6.1.7-next.
|
|
15
|
-
"@forge/cli-shared": "8.7.0-next.
|
|
16
|
-
"@forge/csp": "5.0.2-next.0-experimental-
|
|
17
|
-
"@forge/runtime": "6.0.
|
|
14
|
+
"@forge/bundler": "6.1.7-next.4-experimental-4baeb60",
|
|
15
|
+
"@forge/cli-shared": "8.7.0-next.4-experimental-4baeb60",
|
|
16
|
+
"@forge/csp": "5.0.2-next.0-experimental-4baeb60",
|
|
17
|
+
"@forge/runtime": "6.0.4-next.0-experimental-4baeb60",
|
|
18
18
|
"cheerio": "^1.1.0",
|
|
19
19
|
"chokidar": "^3.6.0",
|
|
20
20
|
"cloudflared": "^0.7.0",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@atlassian/xen-test-util": "^4.2.0",
|
|
34
|
-
"@forge/manifest": "10.6.0-next.
|
|
34
|
+
"@forge/manifest": "10.6.0-next.3-experimental-4baeb60",
|
|
35
35
|
"@types/express": "^4.17.21",
|
|
36
36
|
"@types/jest": "^29.5.14",
|
|
37
37
|
"@types/node": "20.19.1",
|