@forge/tunnel 6.0.1 → 6.0.2-experimental-959d7b9
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 +162 -0
- package/out/command/start-tunnel-command.d.ts +1 -1
- package/out/command/start-tunnel-command.d.ts.map +1 -1
- package/out/command/start-tunnel-command.js +2 -4
- package/out/servers/csp-reporter-server.d.ts.map +1 -1
- package/out/servers/csp-reporter-server.js +1 -1
- package/out/servers/custom-ui-tunnel-server.d.ts.map +1 -1
- package/out/servers/custom-ui-tunnel-server.js +0 -2
- package/out/servers/dev-server.d.ts +1 -3
- package/out/servers/dev-server.d.ts.map +1 -1
- package/out/servers/dev-server.js +1 -18
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,167 @@
|
|
|
1
1
|
# @forge/tunnel
|
|
2
2
|
|
|
3
|
+
## 6.0.2-experimental-959d7b9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [aebd633]
|
|
8
|
+
- @forge/csp@4.2.0-experimental-959d7b9
|
|
9
|
+
- @forge/bundler@6.1.1-experimental-959d7b9
|
|
10
|
+
|
|
11
|
+
## 6.0.2
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- e118b07: Remove remnants of sandbox runtime
|
|
16
|
+
- Updated dependencies [0402460]
|
|
17
|
+
- Updated dependencies [8d843ca]
|
|
18
|
+
- Updated dependencies [7abca30]
|
|
19
|
+
- Updated dependencies [cfde21e]
|
|
20
|
+
- Updated dependencies [4623865]
|
|
21
|
+
- Updated dependencies [e118b07]
|
|
22
|
+
- Updated dependencies [a26c603]
|
|
23
|
+
- Updated dependencies [8e9a8b5]
|
|
24
|
+
- Updated dependencies [73f3108]
|
|
25
|
+
- Updated dependencies [d544fc6]
|
|
26
|
+
- @forge/cli-shared@8.2.0
|
|
27
|
+
- @forge/bundler@6.1.1
|
|
28
|
+
- @forge/csp@4.2.0
|
|
29
|
+
- @forge/runtime@6.0.2
|
|
30
|
+
|
|
31
|
+
## 6.0.2-next.16
|
|
32
|
+
|
|
33
|
+
### Patch Changes
|
|
34
|
+
|
|
35
|
+
- @forge/bundler@6.1.1-next.16
|
|
36
|
+
- @forge/cli-shared@8.2.0-next.16
|
|
37
|
+
|
|
38
|
+
## 6.0.2-next.15
|
|
39
|
+
|
|
40
|
+
### Patch Changes
|
|
41
|
+
|
|
42
|
+
- @forge/bundler@6.1.1-next.15
|
|
43
|
+
- @forge/cli-shared@8.2.0-next.15
|
|
44
|
+
|
|
45
|
+
## 6.0.2-next.14
|
|
46
|
+
|
|
47
|
+
### Patch Changes
|
|
48
|
+
|
|
49
|
+
- @forge/bundler@6.1.1-next.14
|
|
50
|
+
- @forge/cli-shared@8.2.0-next.14
|
|
51
|
+
|
|
52
|
+
## 6.0.2-next.13
|
|
53
|
+
|
|
54
|
+
### Patch Changes
|
|
55
|
+
|
|
56
|
+
- Updated dependencies [4623865]
|
|
57
|
+
- @forge/cli-shared@8.2.0-next.13
|
|
58
|
+
- @forge/bundler@6.1.1-next.13
|
|
59
|
+
|
|
60
|
+
## 6.0.2-next.12
|
|
61
|
+
|
|
62
|
+
### Patch Changes
|
|
63
|
+
|
|
64
|
+
- Updated dependencies [8d843ca]
|
|
65
|
+
- @forge/cli-shared@8.2.0-next.12
|
|
66
|
+
- @forge/bundler@6.1.1-next.12
|
|
67
|
+
|
|
68
|
+
## 6.0.2-next.11
|
|
69
|
+
|
|
70
|
+
### Patch Changes
|
|
71
|
+
|
|
72
|
+
- Updated dependencies [0402460]
|
|
73
|
+
- @forge/cli-shared@8.2.0-next.11
|
|
74
|
+
- @forge/bundler@6.1.1-next.11
|
|
75
|
+
|
|
76
|
+
## 6.0.2-next.10
|
|
77
|
+
|
|
78
|
+
### Patch Changes
|
|
79
|
+
|
|
80
|
+
- Updated dependencies [cfde21e]
|
|
81
|
+
- @forge/cli-shared@8.2.0-next.10
|
|
82
|
+
- @forge/csp@4.2.0-next.0
|
|
83
|
+
- @forge/bundler@6.1.1-next.10
|
|
84
|
+
|
|
85
|
+
## 6.0.2-next.9
|
|
86
|
+
|
|
87
|
+
### Patch Changes
|
|
88
|
+
|
|
89
|
+
- Updated dependencies [0402460]
|
|
90
|
+
- @forge/cli-shared@8.2.0-next.9
|
|
91
|
+
- @forge/bundler@6.1.1-next.9
|
|
92
|
+
|
|
93
|
+
## 6.0.2-next.8
|
|
94
|
+
|
|
95
|
+
### Patch Changes
|
|
96
|
+
|
|
97
|
+
- Updated dependencies [8e9a8b5]
|
|
98
|
+
- @forge/cli-shared@8.2.0-next.8
|
|
99
|
+
- @forge/bundler@6.1.1-next.8
|
|
100
|
+
|
|
101
|
+
## 6.0.2-next.7
|
|
102
|
+
|
|
103
|
+
### Patch Changes
|
|
104
|
+
|
|
105
|
+
- @forge/bundler@6.1.1-next.7
|
|
106
|
+
- @forge/cli-shared@8.2.0-next.7
|
|
107
|
+
|
|
108
|
+
## 6.0.2-next.6
|
|
109
|
+
|
|
110
|
+
### Patch Changes
|
|
111
|
+
|
|
112
|
+
- e118b07: Remove remnants of sandbox runtime
|
|
113
|
+
- Updated dependencies [e118b07]
|
|
114
|
+
- @forge/cli-shared@8.2.0-next.6
|
|
115
|
+
- @forge/runtime@6.0.2-next.0
|
|
116
|
+
- @forge/bundler@6.1.1-next.6
|
|
117
|
+
|
|
118
|
+
## 6.0.2-next.5
|
|
119
|
+
|
|
120
|
+
### Patch Changes
|
|
121
|
+
|
|
122
|
+
- Updated dependencies [d544fc6]
|
|
123
|
+
- @forge/cli-shared@8.2.0-next.5
|
|
124
|
+
- @forge/bundler@6.1.1-next.5
|
|
125
|
+
|
|
126
|
+
## 6.0.2-next.4
|
|
127
|
+
|
|
128
|
+
### Patch Changes
|
|
129
|
+
|
|
130
|
+
- Updated dependencies [73f3108]
|
|
131
|
+
- @forge/cli-shared@8.2.0-next.4
|
|
132
|
+
- @forge/bundler@6.1.1-next.4
|
|
133
|
+
|
|
134
|
+
## 6.0.2-next.3
|
|
135
|
+
|
|
136
|
+
### Patch Changes
|
|
137
|
+
|
|
138
|
+
- Updated dependencies [a26c603]
|
|
139
|
+
- @forge/cli-shared@8.2.0-next.3
|
|
140
|
+
- @forge/bundler@6.1.1-next.3
|
|
141
|
+
|
|
142
|
+
## 6.0.2-next.2
|
|
143
|
+
|
|
144
|
+
### Patch Changes
|
|
145
|
+
|
|
146
|
+
- Updated dependencies [05d33ea]
|
|
147
|
+
- @forge/cli-shared@8.2.0-next.2
|
|
148
|
+
- @forge/bundler@6.1.1-next.2
|
|
149
|
+
|
|
150
|
+
## 6.0.2-next.1
|
|
151
|
+
|
|
152
|
+
### Patch Changes
|
|
153
|
+
|
|
154
|
+
- Updated dependencies [7abca30]
|
|
155
|
+
- @forge/bundler@6.1.1-next.1
|
|
156
|
+
- @forge/cli-shared@8.1.1-next.1
|
|
157
|
+
|
|
158
|
+
## 6.0.2-next.0
|
|
159
|
+
|
|
160
|
+
### Patch Changes
|
|
161
|
+
|
|
162
|
+
- @forge/bundler@6.1.1-next.0
|
|
163
|
+
- @forge/cli-shared@8.1.1-next.0
|
|
164
|
+
|
|
3
165
|
## 6.0.1
|
|
4
166
|
|
|
5
167
|
### 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,EAAmB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAI1G,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;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,
|
|
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,EAAmB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAI1G,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;AACzE,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;CACzC;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;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,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,YAAY,CASlB;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,gCAAgC,CAiCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CA8C9E"}
|
|
@@ -50,17 +50,15 @@ class StartTunnelCommand {
|
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
52
|
startResourceBasedTunnelsServers = async (resourceDetails, options) => {
|
|
53
|
-
const portMap = options.resourcePortMap ?? JSON.parse(process.env.RESOURCE_PORT_MAP ?? '{}');
|
|
54
53
|
const { permissions = {}, remotes = [], translations: i18nConfig } = await this.configFile.readConfig();
|
|
55
|
-
const
|
|
56
|
-
const cspReporterPort = process.env.CSP_REPORTER_PORT ? parseInt(process.env.CSP_REPORTER_PORT, 10) : availablePort;
|
|
54
|
+
const cspReporterPort = await (0, portfinder_1.getPortPromise)({ port: 4000 });
|
|
57
55
|
if (resourceDetails.length === 0)
|
|
58
56
|
return [];
|
|
59
57
|
this.cspReporterServer = new servers_1.CspReporterServer(cspReporterPort, this.logger, new node_cache_1.default());
|
|
60
58
|
await this.cspReporterServer.start();
|
|
61
59
|
return await Promise.all(resourceDetails.map(async (rd) => {
|
|
62
60
|
const { key, resourceType } = rd;
|
|
63
|
-
const port =
|
|
61
|
+
const port = options.resourcePortMap[key];
|
|
64
62
|
const tunnelServer = resourceType === 'nativeUI' ? servers_1.NativeUITunnelServer : servers_1.CustomUITunnelServer;
|
|
65
63
|
this.tunnelServers[key] = new tunnelServer({
|
|
66
64
|
...rd,
|
|
@@ -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,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;
|
|
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;IActB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}
|
|
@@ -39,7 +39,7 @@ class CspReporterServer {
|
|
|
39
39
|
this.server.on('error', (err) => {
|
|
40
40
|
const error = err;
|
|
41
41
|
if (error.code === 'EADDRINUSE') {
|
|
42
|
-
reject(new cli_shared_1.UserError(`Port ${this.port} is already in use
|
|
42
|
+
reject(new cli_shared_1.UserError(`Port ${this.port} is already in use.`));
|
|
43
43
|
}
|
|
44
44
|
else {
|
|
45
45
|
reject(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-ui-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/custom-ui-tunnel-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"custom-ui-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/custom-ui-tunnel-server.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAG9D,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE1F,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAgC,MAAM,cAAc,CAAC;AAMrG,qBAAa,oBAAqB,SAAQ,oBAAqB,YAAW,iBAAiB;IAM7E,OAAO,CAAC,QAAQ,CAAC,UAAU;IALvC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,OAAO,CAAC,MAAM,CAAqB;gBAEN,UAAU,EAAE,wBAAwB;IA2C3D,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAkBhD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IASd,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC;IAK5C,MAAM,IAAI,OAAO;IAIjB,OAAO,CAAC,gCAAgC;IAoBxC,OAAO,CAAC,sBAAsB;CAO/B"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CustomUITunnelServer = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const net_1 = tslib_1.__importDefault(require("net"));
|
|
6
5
|
const url_1 = require("url");
|
|
7
6
|
const express_1 = tslib_1.__importDefault(require("express"));
|
|
8
7
|
const http_proxy_middleware_1 = require("http-proxy-middleware");
|
|
@@ -29,7 +28,6 @@ class CustomUITunnelServer extends resource_tunnel_server_1.ResourceTunnelServer
|
|
|
29
28
|
}
|
|
30
29
|
this.app.use(this.getCustomUIHtmlTransformMiddleware(permissions, remotes));
|
|
31
30
|
if (tunnel) {
|
|
32
|
-
net_1.default.setDefaultAutoSelectFamily?.(true);
|
|
33
31
|
const { port: tunnelPort } = tunnel;
|
|
34
32
|
this.proxy = (0, http_proxy_middleware_1.createProxyMiddleware)({
|
|
35
33
|
target: `http://${this.tunnelArgs.host}:${tunnelPort}`,
|
|
@@ -34,10 +34,8 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
|
|
|
34
34
|
private readonly i18nResourceBundlingService;
|
|
35
35
|
private app;
|
|
36
36
|
private httpServer;
|
|
37
|
-
private permissions;
|
|
38
|
-
private remotes;
|
|
39
37
|
constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService, i18nResourceBundlingService: I18nResourceBundlingService);
|
|
40
|
-
start(port?: number,
|
|
38
|
+
start(port?: number, _permissions?: Permissions, _remotes?: Remotes): Promise<StartDevServerResult>;
|
|
41
39
|
stop(): Promise<void>;
|
|
42
40
|
compileAndWatch(watch: BundlerWatch, tunnelOptions?: TunnelOptions): Promise<BundlerOutput>;
|
|
43
41
|
getApp(): express.Application;
|
|
@@ -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,EACd,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;
|
|
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,EACd,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;IAsC9D,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;IA8BlB,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CA4BtC;CACH"}
|
|
@@ -26,8 +26,6 @@ class LocalDevelopmentServer {
|
|
|
26
26
|
i18nResourceBundlingService;
|
|
27
27
|
app;
|
|
28
28
|
httpServer;
|
|
29
|
-
permissions;
|
|
30
|
-
remotes;
|
|
31
29
|
constructor(invocationService, logger, configFile, fileSystemReader, statsigService, i18nResourceBundlingService) {
|
|
32
30
|
this.invocationService = invocationService;
|
|
33
31
|
this.logger = logger;
|
|
@@ -63,9 +61,7 @@ class LocalDevelopmentServer {
|
|
|
63
61
|
}
|
|
64
62
|
}));
|
|
65
63
|
}
|
|
66
|
-
async start(port = 0,
|
|
67
|
-
this.permissions = permissions;
|
|
68
|
-
this.remotes = remotes;
|
|
64
|
+
async start(port = 0, _permissions, _remotes) {
|
|
69
65
|
this.httpServer = await new Promise((resolve, reject) => {
|
|
70
66
|
const httpServer = this.app.listen({ port });
|
|
71
67
|
httpServer.on('error', reject).on('listening', () => resolve(httpServer));
|
|
@@ -109,19 +105,6 @@ class LocalDevelopmentServer {
|
|
|
109
105
|
}
|
|
110
106
|
});
|
|
111
107
|
request.variables = [...envVars].sort((a, b) => a.key.localeCompare(b.key));
|
|
112
|
-
const allowList = this.permissions?.external?.fetch?.backend
|
|
113
|
-
?.map((item) => {
|
|
114
|
-
if (typeof item === 'string')
|
|
115
|
-
return item;
|
|
116
|
-
if ('address' in item)
|
|
117
|
-
return item.address;
|
|
118
|
-
return this.remotes?.find((remote) => remote.key === item.remote)?.baseUrl;
|
|
119
|
-
})
|
|
120
|
-
.filter((item) => typeof item === 'string') ?? undefined;
|
|
121
|
-
request._meta = {
|
|
122
|
-
...request._meta,
|
|
123
|
-
fetchAllowList: allowList
|
|
124
|
-
};
|
|
125
108
|
try {
|
|
126
109
|
const invokeResults = await this.invocationService.invoke(request.handler, request);
|
|
127
110
|
if (!invokeResults.success) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forge/tunnel",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.2-experimental-959d7b9",
|
|
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.
|
|
15
|
-
"@forge/cli-shared": "8.
|
|
16
|
-
"@forge/csp": "4.
|
|
17
|
-
"@forge/runtime": "6.0.
|
|
14
|
+
"@forge/bundler": "6.1.1-experimental-959d7b9",
|
|
15
|
+
"@forge/cli-shared": "8.2.0",
|
|
16
|
+
"@forge/csp": "4.2.0-experimental-959d7b9",
|
|
17
|
+
"@forge/runtime": "6.0.2",
|
|
18
18
|
"chokidar": "^3.6.0",
|
|
19
19
|
"cloudflared": "^0.7.0",
|
|
20
20
|
"express": "^4.18.3",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@atlassian/xen-test-util": "^4.2.0",
|
|
33
|
-
"@forge/manifest": "10.
|
|
33
|
+
"@forge/manifest": "10.2.0",
|
|
34
34
|
"@types/express": "^4.17.21",
|
|
35
35
|
"@types/jest": "^29.5.14",
|
|
36
36
|
"@types/node": "20.19.1",
|