@forge/tunnel 1.5.0-next.23 → 1.5.0-next.27

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @forge/tunnel
 
+## 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

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "1.5.0-next.23",
+  "version": "1.5.0-next.27",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,11 +16,11 @@
     "postbuild": "chmod +x out/*.js"
   },
   "dependencies": {
-    "@forge/bundler": "1.1.0-next.21",
-    "@forge/cli-shared": "2.2.0-next.18",
-    "@forge/csp": "^1.8.1-next.0",
+    "@forge/bundler": "1.1.0-next.25",
+    "@forge/cli-shared": "2.2.0-next.22",
+    "@forge/csp": "^1.9.0-next.1",
     "@forge/isolated-vm": "3.3.10",
-    "@forge/runtime": "1.12.0-next.6",
+    "@forge/runtime": "1.12.0-next.7",
     "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": "^2.6.0-next.17",
+    "@forge/manifest": "^3.0.0-next.21",
     "@types/express": "^4.17.2",
     "@types/express-mung": "^0.5.2",
     "@types/jest": "^26.0.0",