@forge/tunnel 0.0.0-experimental-64caa5a → 0.0.0-experimental-490cfcf

package/CHANGELOG.md

@@ -1,22 +1,486 @@
 # @forge/tunnel
 
-## 0.0.0-experimental-64caa5a
+## 0.0.0-experimental-490cfcf
 
 ### Patch Changes
 
-- Updated dependencies [348c663]
-- Updated dependencies [1565b05]
+- Updated dependencies [04cddca]
+- Updated dependencies [b820659]
+  - @forge/bundler@0.0.0-experimental-490cfcf
+  - @forge/runtime@0.0.0-experimental-490cfcf
+  - @forge/cli-shared@0.0.0-experimental-490cfcf
+
+## 1.6.1-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.1
+- @forge/bundler@3.0.2-next.2
+
+## 1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies [b820659]
+  - @forge/runtime@1.16.0-next.0
+
+## 1.6.1-next.1
+
+### Patch Changes
+
+- Updated dependencies [04cddcaa]
+  - @forge/bundler@3.0.2-next.1
+
+## 1.6.1-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.1-next.0
+- @forge/bundler@3.0.2-next.0
+
+## 1.6.0
+
+### Minor Changes
+
+- cee5eea1: Observability improvements
+
+### Patch Changes
+
+- 68c1a7f: Fix for observability
+- ca79652: Improve observability
+- Updated dependencies [b673009]
+- Updated dependencies [cee5eea1]
+- Updated dependencies [47a71a6]
+- Updated dependencies [e95919f]
+- Updated dependencies [56164fe]
+- Updated dependencies [949bd40]
+- Updated dependencies [cf2420d]
+- Updated dependencies [ca79652]
+  - @forge/runtime@1.15.0
+  - @forge/cli-shared@2.3.0
+  - @forge/csp@1.10.0
+  - @forge/bundler@3.0.1
+
+## 1.6.0-next.14
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.11
+- @forge/bundler@3.0.1-next.12
+
+## 1.6.0-next.13
+
+### Patch Changes
+
+- 68c1a7f3: Fix for observability
+
+## 1.6.0-next.12
+
+### Patch Changes
+
+- Updated dependencies [47a71a62]
+  - @forge/cli-shared@2.3.0-next.10
+  - @forge/runtime@1.15.0-next.4
+  - @forge/bundler@3.0.1-next.11
+
+## 1.6.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [cf2420d2]
+  - @forge/cli-shared@2.3.0-next.9
+  - @forge/bundler@3.0.1-next.10
+
+## 1.6.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [b6730093]
+  - @forge/runtime@1.15.0-next.3
+
+## 1.6.0-next.9
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.8
+- @forge/bundler@3.0.1-next.9
+
+## 1.6.0-next.8
+
+### Patch Changes
+
+- ca79652: Improve observability
+- Updated dependencies [ca79652]
+  - @forge/runtime@1.15.0-next.2
+  - @forge/cli-shared@2.3.0-next.7
+  - @forge/bundler@3.0.1-next.8
+
+## 1.6.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [e95919f]
+  - @forge/csp@1.10.0-next.1
+  - @forge/cli-shared@2.3.0-next.6
+  - @forge/bundler@3.0.1-next.7
+
+## 1.6.0-next.6
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.5
+- @forge/bundler@3.0.1-next.6
+
+## 1.6.0-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.4
+- @forge/bundler@3.0.1-next.5
+
+## 1.6.0-next.4
+
+### Minor Changes
+
+- cee5eea: Observability improvements
+
+### Patch Changes
+
+- Updated dependencies [cee5eea]
+  - @forge/runtime@1.15.0-next.1
+  - @forge/cli-shared@2.3.0-next.3
+  - @forge/bundler@3.0.1-next.4
+
+## 1.5.3-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.2
+- @forge/bundler@3.0.1-next.3
+
+## 1.5.3-next.2
+
+### Patch Changes
+
+- Updated dependencies [56164fe]
+  - @forge/csp@1.10.0-next.0
+  - @forge/runtime@1.14.1-next.0
+  - @forge/bundler@3.0.1-next.2
+
+## 1.5.3-next.1
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.1
+- @forge/bundler@3.0.1-next.1
+
+## 1.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies [949bd40]
+  - @forge/cli-shared@2.3.0-next.0
+  - @forge/bundler@3.0.1-next.0
+
+## 1.5.2
+
+### Patch Changes
+
+- Updated dependencies [1f6cf08]
+- Updated dependencies [f27cbfc]
+- Updated dependencies [04fcd8c]
+- Updated dependencies [3103a29]
+- Updated dependencies [60fcb01]
+- Updated dependencies [66f17fe]
+- Updated dependencies [25bcf54]
+- Updated dependencies [057cdfc]
+  - @forge/bundler@3.0.0
+  - @forge/runtime@1.14.0
+  - @forge/cli-shared@2.2.2
+
+## 1.5.2-next.11
+
+### Patch Changes
+
+- Updated dependencies [04fcd8c7]
+  - @forge/bundler@3.0.0-next.10
+
+## 1.5.2-next.10
+
+### Patch Changes
+
+- Updated dependencies [057cdfcc]
+  - @forge/bundler@3.0.0-next.9
+  - @forge/cli-shared@2.2.2-next.6
+
+## 1.5.2-next.9
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.5
+- @forge/bundler@3.0.0-next.8
+
+## 1.5.2-next.8
+
+### Patch Changes
+
+- Updated dependencies [3103a290]
+  - @forge/bundler@3.0.0-next.7
+  - @forge/cli-shared@2.2.2-next.4
+
+## 1.5.2-next.7
+
+### Patch Changes
+
+- Updated dependencies [66f17fe]
+  - @forge/runtime@1.14.0-next.1
+
+## 1.5.2-next.6
+
+### Patch Changes
+
+- Updated dependencies [60fcb01]
+  - @forge/bundler@3.0.0-next.6
+
+## 1.5.2-next.5
+
+### Patch Changes
+
+- Updated dependencies [1f6cf083]
+  - @forge/bundler@2.1.0-next.5
+
+## 1.5.2-next.4
+
+### Patch Changes
+
+- Updated dependencies [25bcf54e]
+  - @forge/runtime@1.14.0-next.0
+  - @forge/cli-shared@2.2.2-next.3
+  - @forge/bundler@2.0.1-next.4
+
+## 1.5.2-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.2
+- @forge/bundler@2.0.1-next.3
+
+## 1.5.2-next.2
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.1
+- @forge/bundler@2.0.1-next.2
+
+## 1.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies [f27cbfc]
+  - @forge/bundler@2.0.1-next.1
+
+## 1.5.2-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.0
+- @forge/bundler@2.0.1-next.0
+
+## 1.5.1
+
+### Patch Changes
+
+- Updated dependencies [37f9898]
+- Updated dependencies [037c31a5]
+- Updated dependencies [7d0ef8b]
+  - @forge/bundler@2.0.0
+  - @forge/runtime@1.13.0
+  - @forge/cli-shared@2.2.1
+
+## 1.5.1-next.13
+
+### Patch Changes
+
+- Updated dependencies [7d0ef8b]
+  - @forge/bundler@2.0.0-next.13
+
+## 1.5.1-next.12
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.9
+- @forge/bundler@2.0.0-next.12
+
+## 1.5.1-next.11
+
+### Patch Changes
+
+- Updated dependencies [37f9898]
+  - @forge/bundler@2.0.0-next.11
+
+## 1.5.1-next.10
+
+### Patch Changes
+
+- @forge/bundler@2.0.0-next.10
+- @forge/cli-shared@2.2.1-next.8
+
+## 1.5.1-next.9
+
+### Patch Changes
+
+- Updated dependencies [037c31a]
+  - @forge/bundler@2.0.0-next.9
+  - @forge/runtime@1.13.0-next.1
+  - @forge/cli-shared@2.2.1-next.7
+
+## 1.5.1-next.8
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.8
+
+## 1.5.1-next.7
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.6
+- @forge/bundler@1.1.1-next.7
+
+## 1.5.1-next.6
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.6
+
+## 1.5.1-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.5
+- @forge/bundler@1.1.1-next.5
+
+## 1.5.1-next.4
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.4
+- @forge/cli-shared@2.2.1-next.4
+
+## 1.5.1-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.3
+- @forge/bundler@1.1.1-next.3
+
+## 1.5.1-next.2
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.2
+- @forge/cli-shared@2.2.1-next.2
+
+## 1.5.1-next.1
+
+### Patch Changes
+
+- @forge/runtime@1.12.1-next.0
+- @forge/cli-shared@2.2.1-next.1
+- @forge/bundler@1.1.1-next.1
+
+## 1.5.1-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.0
+- @forge/bundler@1.1.1-next.0
+
+## 1.5.0
+
+### Minor Changes
+
+- 1c196ff: Add support for external fetch client to reference remote
+- 6abbbd0: Upgrade forge runtime to use node 14
+
+### Patch Changes
+
+- Updated dependencies [1dba082]
+- Updated dependencies [1c196ff]
+- Updated dependencies [1dba082]
 - Updated dependencies [8571c05]
-- Updated dependencies [f4c23d3]
-- Updated dependencies [7f249d0]
-- Updated dependencies [5bf2ff0]
-- Updated dependencies [04e4152]
-- Updated dependencies [2338be5]
+- Updated dependencies [8c1de69]
+- Updated dependencies [1dba082]
+- Updated dependencies [1dba082]
+- Updated dependencies [6abbbd0]
+- Updated dependencies [1dba082]
 - Updated dependencies [b63af27]
-  - @forge/bundler@0.0.0-experimental-64caa5a
-  - @forge/runtime@0.0.0-experimental-64caa5a
-  - @forge/cli-shared@0.0.0-experimental-64caa5a
-  - @forge/csp@0.0.0-experimental-64caa5a
+  - @forge/bundler@1.1.0
+  - @forge/runtime@1.12.0
+  - @forge/csp@1.9.0
+  - @forge/cli-shared@2.2.0
+
+## 1.5.0-next.27
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.0-next.22
+- @forge/bundler@1.1.0-next.25
+
+## 1.5.0-next.26
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.0-next.21
+- @forge/bundler@1.1.0-next.24
+
+## 1.5.0-next.25
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.0-next.20
+- @forge/bundler@1.1.0-next.23
+
+## 1.5.0-next.24
+
+### Minor Changes
+
+- 1c196ff: Add support for external fetch client to reference remote
+
+### Patch Changes
+
+- Updated dependencies [1c196ff]
+  - @forge/csp@1.9.0-next.1
+  - @forge/runtime@1.12.0-next.7
+  - @forge/cli-shared@2.2.0-next.19
+  - @forge/bundler@1.1.0-next.22
+
+## 1.5.0-next.23
+
+### Patch Changes
+
+- Updated dependencies [8c1de69]
+  - @forge/runtime@1.12.0-next.6
+
+## 1.5.0-next.22
+
+### Minor Changes
+
+- 6abbbd0: Upgrade forge runtime to use node 14
+
+### Patch Changes
+
+- Updated dependencies [6abbbd0]
+  - @forge/runtime@1.12.0-next.5
+  - @forge/cli-shared@2.2.0-next.18
+  - @forge/bundler@1.1.0-next.21
+
+## 1.4.9-next.21
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.0-next.17
+- @forge/bundler@1.1.0-next.20
 
 ## 1.4.9-next.20
 

package/out/tunnelling/command/interactors/function-change-watcher.js

@@ -49,7 +49,7 @@ class LocalFunctionHost {
             bundleFileSourceMapPath: path_1.resolve(directory, `${bundleName}.js.map`),
             bundleFileSourceMap: bundledCode.sourceMap ? bundledCode.sourceMap[bundleName] : undefined
         }));
-        const manifestFilePath = path_1.resolve(directory, cli_shared_1.manifestFilename);
+        const manifestFilePath = path_1.resolve(directory, cli_shared_1.manifestFileName);
         const manifestContents = JSON.stringify(await this.configFile.readConfig());
         const allPromises = [];
         bundles.forEach((bundle) => allPromises.push(this.generateBundleFiles(bundle, isSnapshotEnabled)));

package/out/tunnelling/command/start-tunnel-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAI9D,OAAO,EAAE,iBAAiB,EAA2C,MAAM,YAAY,CAAC;AACxF,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;AAEzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;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,CAA4C;IACjE,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,CAS3B;IAEF,OAAO,CAAC,0BAA0B,CAgChC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAwC9E"}
+{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAI9D,OAAO,EAAE,iBAAiB,EAA2C,MAAM,YAAY,CAAC;AACxF,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;AAEzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;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,CAA4C;IACjE,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,CAS3B;IAEF,OAAO,CAAC,0BAA0B,CAiChC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAwC9E"}

package/out/tunnelling/command/start-tunnel-command.js

@@ -44,7 +44,7 @@ class StartTunnelCommand {
             var _a, _b;
             const resourcePortMap = JSON.parse((_a = process.env.RESOURCE_PORT_MAP) !== null && _a !== void 0 ? _a : '{}');
             const resourceDetails = await this.configFile.getResources();
-            const { permissions = {} } = await this.configFile.readConfig();
+            const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
             const cspReporterPort = parseInt((_b = process.env.CSP_REPORTER_PORT) !== null && _b !== void 0 ? _b : '4000', 10);
             if (resourceDetails.length === 0)
                 return [];
@@ -53,7 +53,8 @@ class StartTunnelCommand {
             return await Promise.all(resourceDetails.map(async (rd) => {
                 const { key } = rd;
                 const port = resourcePortMap[key];
-                this.tunnelServers[key] = new servers_1.ResourceTunnelServer(Object.assign(Object.assign({}, rd), { port, logger: this.logger, cspReporterServerPort: cspReporterPort, permissions }));
+                this.tunnelServers[key] = new servers_1.ResourceTunnelServer(Object.assign(Object.assign({}, rd), { port, logger: this.logger, cspReporterServerPort: cspReporterPort, permissions,
+                    remotes }));
                 await this.tunnelServers[key].start();
                 return {
                     resourceKey: key,

package/out/tunnelling/servers/dev-server.js

@@ -27,8 +27,8 @@ class LocalDevelopmentServer {
             }).filter((item) => typeof item === 'string')) !== null && _f !== void 0 ? _f : undefined;
             request._meta = Object.assign(Object.assign({}, request._meta), { fetchAllowList: allowList });
             try {
-                const body = await this.invocationService.invoke(request.handler, request);
-                res.json(body);
+                const invokeResults = await this.invocationService.invoke(request.handler, request);
+                res.json(invokeResults);
             }
             catch (error) {
                 try {

package/out/tunnelling/servers/resource-tunnel-server.d.ts

@@ -1,11 +1,12 @@
 import { Resource, Logger } from '@forge/cli-shared';
 import { Express } from 'express';
-import type { Permissions } from '@forge/manifest';
+import type { Permissions, Remotes } from '@forge/manifest';
 export interface ResourceTunnelServerArgs extends Resource {
     port: number;
     logger: Logger;
     permissions: Permissions;
     cspReporterServerPort: number;
+    remotes: Remotes;
 }
 export declare class ResourceTunnelServer {
     private readonly port;
@@ -17,8 +18,25 @@ export declare class ResourceTunnelServer {
     private readonly proxy;
     private socket;
     private cspReporterServerPort;
-    constructor({ port, key, path, tunnel, permissions, logger, cspReporterServerPort }: ResourceTunnelServerArgs);
+    constructor({ port, key, path, tunnel, permissions, remotes, logger, cspReporterServerPort }: ResourceTunnelServerArgs);
     getApp(): Express;
+    static transformPermissionsWithRemotes(permissions: Permissions, remotes: Remotes): {
+        external: {
+            fetch: {
+                client: string[] | undefined;
+                backend?: import("@forge/manifest/out/schema/manifest").Backend | undefined;
+            };
+            fonts?: import("@forge/manifest/out/schema/manifest").Fonts | undefined;
+            frames?: import("@forge/manifest/out/schema/manifest").Frames | undefined;
+            navigation?: import("@forge/manifest/out/schema/manifest").Navigation | undefined;
+            images?: import("@forge/manifest/out/schema/manifest").Images | undefined;
+            media?: import("@forge/manifest/out/schema/manifest").Media | undefined;
+            scripts?: import("@forge/manifest/out/schema/manifest").Scripts1 | undefined;
+            styles?: import("@forge/manifest/out/schema/manifest").Styles1 | undefined;
+        };
+        scopes?: import("@forge/manifest/out/schema/manifest").Scopes | undefined;
+        content?: import("@forge/manifest/out/schema/manifest").Content1 | undefined;
+    };
     start(): Promise<void>;
     stop(): Promise<void>;
     private logFileServed;

package/out/tunnelling/servers/resource-tunnel-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/servers/resource-tunnel-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAMR,MAAM,EAGP,MAAM,mBAAmB,CAAC;AAC3B,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAM9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAYD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,qBAAqB,CAAS;gBAE1B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,qBAAqB,EAAE,EAAE,wBAAwB;IA0C7G,MAAM,IAAI,OAAO;IAIX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,gCAAgC;IAoBxC,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,YAAY,CAOJ;IAEhB,OAAO,CAAC,wBAAwB,CAG3B;IAEL,OAAO,CAAC,yBAAyB,CAG5B;IAEL,OAAO,CAAC,6BAA6B,CAwBhC;CACN"}
+{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/servers/resource-tunnel-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAMR,MAAM,EAGP,MAAM,mBAAmB,CAAC;AAC3B,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAM9D,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;CAClB;AAYD,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,SAAgB,GAAG,EAAE,MAAM,CAAC;IAC5B,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6B;IACnD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,qBAAqB,CAAS;gBAE1B,EACV,IAAI,EACJ,GAAG,EACH,IAAI,EACJ,MAAM,EACN,WAAW,EACX,OAAO,EACP,MAAM,EACN,qBAAqB,EACtB,EAAE,wBAAwB;IA0C3B,MAAM,IAAI,OAAO;IAIjB,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;IAa3E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,gCAAgC;IAoBxC,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,YAAY,CAOJ;IAEhB,OAAO,CAAC,wBAAwB,CAG3B;IAEL,OAAO,CAAC,yBAAyB,CAG5B;IAEL,OAAO,CAAC,6BAA6B,CAwBhC;CACN"}

package/out/tunnelling/servers/resource-tunnel-server.js

@@ -13,7 +13,7 @@ var ConnectionErrorCode;
 })(ConnectionErrorCode || (ConnectionErrorCode = {}));
 const HOST = process.env.FORGE_DEV_TUNNEL ? 'localhost' : 'host.docker.internal';
 class ResourceTunnelServer {
-    constructor({ port, key, path, tunnel, permissions, logger, cspReporterServerPort }) {
+    constructor({ port, key, path, tunnel, permissions, remotes, logger, cspReporterServerPort }) {
         this.getCspHeader = (existingCsp) => new csp_1.CSPInjectionService()
             .getInjectableCSP(existingCsp, cli_shared_1.getEnvironment(cli_shared_1.CDNEnvironments), `http://localhost:${this.cspReporterServerPort}`)
             .join('; ');
@@ -23,14 +23,14 @@ class ResourceTunnelServer {
         this.injectIframeResizerScript = (htmlContent) => new cli_shared_1.IframeResizerScriptService().injectIframeResizer(htmlContent, () => {
             throw new Error('Malformed HTML document');
         });
-        this.getCustomUIResourceMiddleware = (permissions) => express_mung_1.write((body, _, __, res) => {
+        this.getCustomUIResourceMiddleware = (permissions, remotes) => express_mung_1.write((body, _, __, res) => {
             const contentType = res.getHeaders()['content-type'];
             if (!contentType.startsWith('text/html'))
                 return body;
             res.removeHeader('content-length');
             const htmlContentWithIframeResizerScript = this.injectIframeResizerScript(body);
             const htmlContentWithBridgeScript = this.injectGlobalBridgeScript(htmlContentWithIframeResizerScript);
-            const cspDetails = new csp_1.CSPProcessingService({ info: () => { } }).getCspDetails(htmlContentWithBridgeScript, permissions);
+            const cspDetails = new csp_1.CSPProcessingService({ info: () => { } }).getCspDetails(htmlContentWithBridgeScript, ResourceTunnelServer.transformPermissionsWithRemotes(permissions, remotes));
             res.setHeader('Content-Security-Policy', this.getCspHeader(cspDetails));
             return htmlContentWithBridgeScript;
         });
@@ -40,7 +40,7 @@ class ResourceTunnelServer {
         this.logger = logger;
         this.cspReporterServerPort = cspReporterServerPort;
         this.app = express_1.default();
-        this.app.use(this.getCustomUIResourceMiddleware(permissions));
+        this.app.use(this.getCustomUIResourceMiddleware(permissions, remotes));
         if (tunnel) {
             const { port: tunnelPort } = tunnel;
             this.proxy = http_proxy_middleware_1.createProxyMiddleware({
@@ -76,6 +76,16 @@ class ResourceTunnelServer {
     getApp() {
         return this.app;
     }
+    static transformPermissionsWithRemotes(permissions, remotes) {
+        var _a, _b, _c, _d, _e;
+        const client = (_d = (_c = (_b = (_a = permissions.external) === null || _a === void 0 ? void 0 : _a.fetch) === null || _b === void 0 ? void 0 : _b.client) === null || _c === void 0 ? void 0 : _c.map((item) => {
+            var _a;
+            if (typeof item === 'string')
+                return item;
+            return (_a = remotes === null || remotes === void 0 ? void 0 : remotes.find((remote) => remote.key === item.remote)) === null || _a === void 0 ? void 0 : _a.baseUrl;
+        }).filter((item) => typeof item === 'string')) !== null && _d !== void 0 ? _d : undefined;
+        return Object.assign(Object.assign({}, permissions), { external: Object.assign(Object.assign({}, permissions.external), { fetch: Object.assign(Object.assign({}, (_e = permissions.external) === null || _e === void 0 ? void 0 : _e.fetch), { client }) }) });
+    }
     async start() {
         return new Promise((resolve) => {
             this.server = this.app.listen(this.port, resolve);

package/out/tunnelling/services/local-invocation-service.d.ts

@@ -7,5 +7,9 @@ export declare class LocalInvocationService implements InvocationService {
     private readonly inspector;
     constructor(configFile: ConfigFile, logger: Logger, inspector: Inspector);
     invoke(handler: string, request: ExternalRequestBody): Promise<any>;
+    static INTERNAL_METRICS: string[];
+    static printMetrics: (shouldReportMetrics: boolean, metrics: {
+        [key: string]: any;
+    }[] | undefined, logger: Logger) => void;
 }
 //# sourceMappingURL=local-invocation-service.d.ts.map

package/out/tunnelling/services/local-invocation-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAE9E,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;CA+CjF"}
+{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAI9E,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;IAqDhF,MAAM,CAAC,gBAAgB,WAA6D;IAEpF,MAAM,CAAC,YAAY,wBACI,OAAO;;6BAEpB,MAAM,KACb,IAAI,CAUL;CACH"}

package/out/tunnelling/services/local-invocation-service.js

@@ -8,6 +8,7 @@ const v4_1 = tslib_1.__importDefault(require("uuid/v4"));
 const runtime_1 = require("@forge/runtime");
 const cli_shared_1 = require("@forge/cli-shared");
 const interactors_1 = require("../command/interactors");
+const feature_flag_1 = require("@forge/runtime/out/feature-flag");
 class LocalInvocationService {
     constructor(configFile, logger, inspector) {
         this.configFile = configFile;
@@ -43,13 +44,21 @@ class LocalInvocationService {
             ctx: { requestId, traceId: requestId, timeout: interactors_1.INVOCATION_TIMEOUT }
         });
         const invocationLimits = runtime_1.perInvocationLimitsTrackerFactory(xenInvocationRequest);
-        const { body } = await runtime_1.invoke({
+        const { body, metrics } = await runtime_1.invoke({
             sandbox,
             xenInvocationRequest,
             invocationLimits,
             inspector: inspect ? this.inspector : undefined
         });
-        return body;
+        const reportMetrics = xenInvocationRequest.isFeatureFlagEnabled(feature_flag_1.XEN_RUNTIME_SHOULD_REPORT_METRICS);
+        LocalInvocationService.printMetrics(reportMetrics, metrics, this.logger);
+        return reportMetrics ? { body, metrics } : body;
     }
 }
 exports.LocalInvocationService = LocalInvocationService;
+LocalInvocationService.INTERNAL_METRICS = ['execute.setup-request-context', 'invoke.setup-isolate'];
+LocalInvocationService.printMetrics = (shouldReportMetrics, metrics, logger) => {
+    if (shouldReportMetrics && (metrics === null || metrics === void 0 ? void 0 : metrics.length)) {
+        logger.debug(`Metrics: ${JSON.stringify(metrics.filter((m) => !LocalInvocationService.INTERNAL_METRICS.includes(m.name)), null, 2)}`);
+    }
+};

package/out/tunnelling/util/invocation-utils.d.ts

@@ -5,9 +5,15 @@ interface LambdaError {
     errorMessage: string;
     stack: string[];
     serviceKey?: string;
+    metrics?: {
+        [key: string]: any;
+    }[];
 }
 interface InvokeFunctionErrors extends Error {
     serviceKey?: string;
+    metrics?: {
+        [key: string]: any;
+    }[];
 }
 export declare const toLambdaError: (error: InvokeFunctionErrors) => LambdaError;
 export declare const getRequestId: (request: any, value?: string) => string;

package/out/tunnelling/util/invocation-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invocation-utils.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/util/invocation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAK3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,oBAAqB,SAAQ,KAAK;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,aAAa,UAAW,oBAAoB,KAAG,WAO3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,GAAG,qBAAsB,MAU9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAAW,GAAG,KAAG,MAGhE,CAAC;AAMF,eAAO,MAAM,eAAe,QAAO,MAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,UAAU,KAAG,MAUpD,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,0BAY3C,CAAC"}
+{"version":3,"file":"invocation-utils.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/util/invocation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAK3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;CACpC;AAED,UAAU,oBAAqB,SAAQ,KAAK;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;CACpC;AAED,eAAO,MAAM,aAAa,UAAW,oBAAoB,KAAG,WAQ3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,GAAG,qBAAsB,MAU9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAAW,GAAG,KAAG,MAGhE,CAAC;AAMF,eAAO,MAAM,eAAe,QAAO,MAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,UAAU,KAAG,MAUpD,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,0BAY3C,CAAC"}

package/out/tunnelling/util/invocation-utils.js

@@ -7,7 +7,8 @@ exports.toLambdaError = (error) => {
         errorMessage: error.message,
         errorType: error.name,
         stack: (error.stack || '').split('\n'),
-        serviceKey: error.serviceKey
+        serviceKey: error.serviceKey,
+        metrics: error.metrics
     };
 };
 exports.getRequestId = (request, value = 'unknown') => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "0.0.0-experimental-64caa5a",
+  "version": "0.0.0-experimental-490cfcf",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,11 +16,11 @@
     "postbuild": "chmod +x out/*.js"
   },
   "dependencies": {
-    "@forge/bundler": "0.0.0-experimental-64caa5a",
-    "@forge/cli-shared": "0.0.0-experimental-64caa5a",
-    "@forge/csp": "^0.0.0-experimental-64caa5a",
+    "@forge/bundler": "0.0.0-experimental-490cfcf",
+    "@forge/cli-shared": "0.0.0-experimental-490cfcf",
+    "@forge/csp": "^1.10.0",
     "@forge/isolated-vm": "3.3.10",
-    "@forge/runtime": "0.0.0-experimental-64caa5a",
+    "@forge/runtime": "0.0.0-experimental-490cfcf",
     "express": "^4.17.1",
     "express-mung": "^0.5.1",
     "http-proxy-middleware": "^1.0.6",
@@ -31,7 +31,7 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@forge/manifest": "^0.0.0-experimental-64caa5a",
+    "@forge/manifest": "^0.0.0-experimental-490cfcf",
     "@types/express": "^4.17.2",
     "@types/express-mung": "^0.5.2",
     "@types/jest": "^26.0.0",
@@ -40,7 +40,7 @@
     "@types/supertest": "^2.0.10",
     "@types/tmp": "^0.1.0",
     "@types/uuid": "^3.4.7",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "2.6.1",
     "supertest": "^6.1.3"
   },
   "optionalDependencies": {