@forge/tunnel 6.2.2-next.3-experimental-1a0bb6a → 6.3.0-next.10

package/CHANGELOG.md

@@ -1,14 +1,66 @@
 # @forge/tunnel
 
-## 6.2.2-next.3-experimental-1a0bb6a
+## 6.3.0-next.10
 
 ### Patch Changes
 
-- Updated dependencies [4cc304c]
-- Updated dependencies [90ee56f]
-  - @forge/csp@5.1.1-next.0-experimental-1a0bb6a
-  - @forge/cli-shared@8.7.2-next.1-experimental-1a0bb6a
-  - @forge/bundler@6.1.9-next.3-experimental-1a0bb6a
+- Updated dependencies [d3008b5]
+  - @forge/cli-shared@8.8.0-next.8
+  - @forge/bundler@6.1.9-next.10
+
+## 6.3.0-next.9
+
+### Patch Changes
+
+- Updated dependencies [a1c8e19]
+  - @forge/cli-shared@8.8.0-next.7
+  - @forge/bundler@6.1.9-next.9
+
+## 6.3.0-next.8
+
+### Minor Changes
+
+- 4947176: Adding self managed tunnel support
+
+### Patch Changes
+
+- Updated dependencies [4947176]
+  - @forge/cli-shared@8.8.0-next.6
+  - @forge/bundler@6.1.9-next.8
+
+## 6.3.0-next.7
+
+### Patch Changes
+
+- @forge/bundler@6.1.9-next.7
+- @forge/cli-shared@8.8.0-next.5
+
+## 6.3.0-next.6
+
+### Patch Changes
+
+- @forge/bundler@6.1.9-next.6
+- @forge/cli-shared@8.8.0-next.4
+
+## 6.3.0-next.5
+
+### Patch Changes
+
+- @forge/bundler@6.1.9-next.5
+- @forge/cli-shared@8.8.0-next.3
+
+## 6.3.0-next.4
+
+### Minor Changes
+
+- 8ff224b: Add automatic spinning up of docker compose stacks for containers when tunneling
+
+### Patch Changes
+
+- Updated dependencies [8ff224b]
+  - @forge/runtime@6.1.0-next.0
+  - @forge/cli-shared@8.8.0-next.2
+  - @forge/bundler@6.1.9-next.4
 
 ## 6.2.2-next.3
 

package/out/command/interactors/tunnel-interactor.d.ts

@@ -6,6 +6,7 @@ export declare class TunnelInteractor {
     private readonly logger;
     private readonly statsigService;
     constructor(logger: Logger, statsigService: StatsigService);
+    private logTunnelStatus;
     handleUserExitEvent(stopFunction: () => Promise<void>, bundleMonitor: WatcherMonitor | undefined, manifestFileWatcher: FSWatcher): Promise<void>;
     watchAndWarnOnManifestChanges(manifestFilePath: string): chokidar.FSWatcher;
     watchApp: (startTunnelResult: StartTunnelResult, tunnelOptions?: TunnelOptions) => Promise<WatcherMonitor | undefined>;

package/out/command/interactors/tunnel-interactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAyC,MAAM,EAAQ,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAgB;IAGzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,MAAM,EAAE,MAAM,EAC/B,cAAc,EAAE,cAAc;IAKzB,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CAwDpC;CACH"}
+{"version":3,"file":"tunnel-interactor.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/tunnel-interactor.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAyC,MAAM,EAAQ,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,qBAAa,gBAAgB;IAGzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAE7B,MAAM,EAAE,MAAM,EAC/B,cAAc,EAAE,cAAc;IAKhC,OAAO,CAAC,eAAe;IAShB,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,EACzC,mBAAmB,EAAE,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAsCT,6BAA6B,CAAC,gBAAgB,EAAE,MAAM;IAUtD,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CAsDpC;CACH"}

package/out/command/interactors/tunnel-interactor.js

@@ -15,6 +15,13 @@ class TunnelInteractor {
         this.logger = logger;
         this.statsigService = statsigService;
     }
+    logTunnelStatus(localPort, tunnelOptions) {
+        this.logger.info('');
+        this.logger.info(cli_shared_1.Text.tunnel.startedServer(localPort, this.logger.debugEnabled) + '\n');
+        if (tunnelOptions.url) {
+            this.logger.warn(cli_shared_1.Text.tunnel.selfManagedTunnel(tunnelOptions.url, localPort));
+        }
+    }
     handleUserExitEvent(stopFunction, bundleMonitor, manifestFileWatcher) {
         return new Promise((resolve, reject) => {
             const rl = readline_1.default.createInterface({
@@ -74,8 +81,7 @@ class TunnelInteractor {
             if (kind === 'runtime') {
                 await reloadSandboxes(output, tunnelOptions);
             }
-            this.logger.info('');
-            this.logger.info(cli_shared_1.Text.tunnel.startedServer(localPort, this.logger.debugEnabled) + '\n');
+            this.logTunnelStatus(localPort, tunnelOptions);
         };
         const multiCompiler = new multi_compiler_watcher_1.MultiCompilerWatcher(faasServer, uiServers);
         if (tunnelOptions.verify) {
@@ -88,8 +94,7 @@ class TunnelInteractor {
                 onUIChange: { onBuildWillStart, onBuildFinished: onBuildFinished('ui') }
             }, tunnelOptions);
             await reloadSandboxes(output, tunnelOptions);
-            this.logger.info('');
-            this.logger.info(cli_shared_1.Text.tunnel.startedServer(localPort, this.logger.debugEnabled) + '\n');
+            this.logTunnelStatus(localPort, tunnelOptions);
         }
         catch (_) {
         }

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

@@ -9,6 +9,7 @@ export interface StartTunnelOptions {
     host: string;
     environmentKey: string;
     resourcePortMap: Record<string, number>;
+    url?: string;
 }
 export interface StartTunnelResult {
     localPort: number;
@@ -29,9 +30,13 @@ export declare class StartTunnelCommand {
     private tunnelServers;
     private cspReporterServer;
     constructor(getAppConfig: AppConfigProvider, devServer: DevelopmentServer, tunnelFactory: CreateTunnelService, tunnelClient: RegisterTunnelService, functionHost: FunctionChangeWatcher, logger: Logger, configFile: ConfigFile);
+    private validateTunnelUrl;
+    private validateTunnelPort;
     private stopServices;
+    stopDockerComposeStack: (composeFiles?: Record<string, string>) => Promise<void>;
+    private deleteDockerComposeFile;
     private startFaaSTunnelServer;
     private startResourceBasedTunnelsServers;
-    execute(options: StartTunnelOptions): Promise<StartTunnelResult>;
+    execute(options: StartTunnelOptions, containersDockerComposeFiles?: Record<string, string>): Promise<StartTunnelResult>;
 }
 //# sourceMappingURL=start-tunnel-command.d.ts.map

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

@@ -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,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"}
+{"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,EACL,iBAAiB,EACjB,UAAU,EACV,MAAM,EAEN,aAAa,EAId,MAAM,mBAAmB,CAAC;AAI3B,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;AAKzE,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;IACxC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;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;AAQD,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,iBAAiB;IAiBzB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,YAAY,CAclB;IAMK,sBAAsB,kBAAyB,OAAO,MAAM,EAAE,MAAM,CAAC,KAAG,QAAQ,IAAI,CAAC,CAyB1F;IAMF,OAAO,CAAC,uBAAuB,CAY7B;IAEF,OAAO,CAAC,qBAAqB,CA+B3B;IAEF,OAAO,CAAC,gCAAgC,CAiCtC;IAEW,OAAO,CAClB,OAAO,EAAE,kBAAkB,EAC3B,4BAA4B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpD,OAAO,CAAC,iBAAiB,CAAC;CA0D9B"}

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

@@ -2,9 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartTunnelCommand = void 0;
 const tslib_1 = require("tslib");
+const cli_shared_1 = require("@forge/cli-shared");
 const node_cache_1 = tslib_1.__importDefault(require("node-cache"));
 const portfinder_1 = require("portfinder");
 const servers_1 = require("../servers");
+const docker_compose_1 = require("docker-compose");
+const path = tslib_1.__importStar(require("path"));
+const fs = tslib_1.__importStar(require("fs"));
+class InvalidTunnelConfigError extends cli_shared_1.UserError {
+    constructor(message) {
+        super(message);
+    }
+}
 class StartTunnelCommand {
     getAppConfig;
     devServer;
@@ -24,26 +33,87 @@ class StartTunnelCommand {
         this.logger = logger;
         this.configFile = configFile;
     }
-    stopServices = async (appId, environmentKey) => {
+    validateTunnelUrl(tunnelUrl) {
+        if (!tunnelUrl) {
+            return;
+        }
+        let parsedUrl;
+        try {
+            parsedUrl = new URL(tunnelUrl);
+        }
+        catch (error) {
+            throw new InvalidTunnelConfigError(cli_shared_1.Text.tunnel.error.invalidSelfManagedTunnelUrl(tunnelUrl));
+        }
+        if (parsedUrl.protocol !== 'https:') {
+            throw new InvalidTunnelConfigError(cli_shared_1.Text.tunnel.error.invalidSelfManagedTunnelUrlProtocol(parsedUrl.protocol));
+        }
+    }
+    validateTunnelPort(port) {
+        if (port === undefined) {
+            return;
+        }
+        if (port < 1 || port > 65535) {
+            throw new InvalidTunnelConfigError(cli_shared_1.Text.tunnel.error.invalidSelfManagedTunnelPort(port.toString()));
+        }
+    }
+    stopServices = async (appId, environmentKey, containersDockerComposeFiles) => {
         await Promise.all([
             this.functionHost.stopWatching(),
             this.tunnelClient.unregisterTunnels(appId, environmentKey),
             this.tunnelFactory.closeTunnel(),
             this.devServer.stop(),
             ...Object.values(this.tunnelServers).map((server) => server.stop()),
-            this.cspReporterServer?.stop()
+            this.cspReporterServer?.stop(),
+            this.stopDockerComposeStack(containersDockerComposeFiles)
         ]);
     };
-    startFaaSTunnelServer = async ({ port, appId, environmentKey }) => {
+    stopDockerComposeStack = async (composeFiles) => {
+        if (!composeFiles || Object.keys(composeFiles).length === 0)
+            return;
+        const { services } = await this.configFile.readConfig();
+        const serviceWithTunnelConfigExists = services?.some((service) => service.containers?.some((container) => {
+            return !!container.tunnel;
+        }));
+        if (!services || services.length === 0 || !serviceWithTunnelConfigExists)
+            return;
+        await Promise.all(Object.entries(composeFiles).map(async ([serviceKey, file]) => {
+            try {
+                await (0, docker_compose_1.downAll)({ cwd: '.', log: true, config: file, composeOptions: [`-p${serviceKey}`] });
+                await this.deleteDockerComposeFile(file);
+            }
+            catch (err) {
+                throw new Error(cli_shared_1.Text.tunnel.unableToStopDockerComposeStack(serviceKey, err.message ?? 'Unknown Error Occurred.'));
+            }
+        }));
+    };
+    deleteDockerComposeFile = async (composeFile) => {
+        if (fs.existsSync(composeFile)) {
+            fs.unlinkSync(composeFile);
+        }
+        const hiddenDir = path.join(process.cwd(), '.services');
+        if (fs.existsSync(hiddenDir)) {
+            const files = fs.readdirSync(hiddenDir);
+            if (files.length == 0) {
+                fs.rmdirSync(hiddenDir);
+            }
+        }
+    };
+    startFaaSTunnelServer = async ({ port, appId, environmentKey, tunnelUrl }) => {
         const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
         const serverInfo = await this.devServer.start(port, permissions, remotes);
-        const { id, token, url } = await this.tunnelClient.setupTunnel(appId, environmentKey);
-        const faasTunnelUrl = await this.tunnelFactory.establishTunnel({
-            port: serverInfo.port,
-            id,
-            token,
-            tunnelUrl: url
-        });
+        let faasTunnelUrl;
+        if (tunnelUrl) {
+            faasTunnelUrl = new URL(tunnelUrl);
+        }
+        else {
+            const { id, token, url } = await this.tunnelClient.setupTunnel(appId, environmentKey);
+            faasTunnelUrl = await this.tunnelFactory.establishTunnel({
+                port: serverInfo.port,
+                id,
+                token,
+                tunnelUrl: url
+            });
+        }
         return {
             ...serverInfo,
             tunnelUrl: faasTunnelUrl
@@ -73,15 +143,18 @@ class StartTunnelCommand {
             return this.tunnelServers[key].start();
         }));
     };
-    async execute(options) {
+    async execute(options, containersDockerComposeFiles) {
         const { id: appId } = await this.getAppConfig();
-        const { port, environmentKey } = options;
+        const { port, environmentKey, url } = options;
+        this.validateTunnelUrl(url);
+        this.validateTunnelPort(port);
         const allResources = await this.configFile.getResources();
         try {
             const faasTunnelServer = await this.startFaaSTunnelServer({
                 port,
                 appId,
-                environmentKey
+                environmentKey,
+                tunnelUrl: url
             });
             const customUITunnelsServers = await this.startResourceBasedTunnelsServers(allResources, options);
             const tunnelDefinitions = {
@@ -92,7 +165,11 @@ class StartTunnelCommand {
                 }))
             };
             await this.tunnelClient.registerTunnels(appId, environmentKey, tunnelDefinitions);
-            const stopFunction = async () => this.stopServices(appId, environmentKey);
+            const stopFunction = async () => this.stopServices(appId, environmentKey, containersDockerComposeFiles);
+            this.devServer.setErrorHandler?.(async (error) => {
+                await this.stopServices(appId, environmentKey, containersDockerComposeFiles);
+                await (0, cli_shared_1.exitOnError)(this.logger, error);
+            });
             const reloadSandboxes = async (bundledCode, tunnelOptions) => {
                 await this.functionHost.stopWatching();
                 await this.functionHost.startWatching(bundledCode, tunnelOptions);
@@ -108,7 +185,7 @@ class StartTunnelCommand {
         }
         catch (e) {
             try {
-                await this.stopServices(appId, environmentKey);
+                await this.stopServices(appId, environmentKey, containersDockerComposeFiles);
             }
             catch { }
             throw e;

package/out/servers/dev-server.d.ts

@@ -4,16 +4,19 @@ import http from 'http';
 import { URL } from 'url';
 import express from 'express';
 import { BundlerWatch, BundlerOutput } from '@forge/bundler';
-import { ConfigFile, FileSystemReader, I18nResourceBundlingService, Logger, StatsigService, TunnelOptions } from '@forge/cli-shared';
+import { AppEnvironmentsGraphqlClient, ConfigFile, FileSystemReader, I18nResourceBundlingService, Logger, StatsigService, TunnelOptions, UserError } from '@forge/cli-shared';
 import { ExternalRequestBody } from '@forge/runtime';
 import { Permissions, Remotes } from '@forge/manifest';
 export interface ProxyServerError extends Error {
     code?: string;
 }
+export declare class TunnelInvocationValidationError extends UserError {
+}
 export interface DevelopmentServer {
     start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
     stop(): Promise<void>;
     compileAndWatch(hooks: BundlerWatch, tunnelOptions?: TunnelOptions): Promise<BundlerOutput>;
+    setErrorHandler?: (handler: (err: Error) => Promise<void>) => void;
 }
 export interface StartDevServerResult {
     port: number;
@@ -32,14 +35,22 @@ export declare class LocalDevelopmentServer implements DevelopmentServer {
     private readonly fileSystemReader;
     private readonly statsigService;
     private readonly i18nResourceBundlingService;
+    private readonly appEnvironmentClient;
     private app;
     private httpServer;
-    constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService, i18nResourceBundlingService: I18nResourceBundlingService);
+    private tunnelOptions;
+    private environmentId;
+    private appId;
+    onFatalError?: (err: Error) => Promise<void>;
+    constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, fileSystemReader: FileSystemReader, statsigService: StatsigService, i18nResourceBundlingService: I18nResourceBundlingService, appEnvironmentClient: AppEnvironmentsGraphqlClient);
     start(port?: number, _permissions?: Permissions, _remotes?: Remotes): Promise<StartDevServerResult>;
     stop(): Promise<void>;
     compileAndWatch(watch: BundlerWatch, tunnelOptions?: TunnelOptions): Promise<BundlerOutput>;
     getApp(): express.Application;
+    setErrorHandler(handler: (err: Error) => Promise<void>): void;
     handleInvocation: express.Handler;
     configureProxyMiddleware: express.Handler;
+    validateApp(request: ExternalRequestBody): Promise<void>;
+    private setEnvironmentAndAppId;
 }
 //# sourceMappingURL=dev-server.d.ts.map

package/out/servers/dev-server.d.ts.map

@@ -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,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"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":"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"}

package/out/servers/dev-server.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalDevelopmentServer = exports.stopServer = void 0;
+exports.LocalDevelopmentServer = exports.stopServer = exports.TunnelInvocationValidationError = void 0;
 const tslib_1 = require("tslib");
 const express_1 = tslib_1.__importDefault(require("express"));
 const bundler_1 = require("@forge/bundler");
@@ -8,6 +8,10 @@ const cli_shared_1 = require("@forge/cli-shared");
 const runtime_1 = require("@forge/runtime");
 const util_1 = require("../util");
 const http_proxy_middleware_1 = require("http-proxy-middleware");
+const ari_1 = require("@forge/util/packages/ari");
+class TunnelInvocationValidationError extends cli_shared_1.UserError {
+}
+exports.TunnelInvocationValidationError = TunnelInvocationValidationError;
 async function stopServer(server) {
     if (!server) {
         return;
@@ -24,15 +28,21 @@ class LocalDevelopmentServer {
     fileSystemReader;
     statsigService;
     i18nResourceBundlingService;
+    appEnvironmentClient;
     app;
     httpServer;
-    constructor(invocationService, logger, configFile, fileSystemReader, statsigService, i18nResourceBundlingService) {
+    tunnelOptions;
+    environmentId;
+    appId;
+    onFatalError;
+    constructor(invocationService, logger, configFile, fileSystemReader, statsigService, i18nResourceBundlingService, appEnvironmentClient) {
         this.invocationService = invocationService;
         this.logger = logger;
         this.configFile = configFile;
         this.fileSystemReader = fileSystemReader;
         this.statsigService = statsigService;
         this.i18nResourceBundlingService = i18nResourceBundlingService;
+        this.appEnvironmentClient = appEnvironmentClient;
         this.app = (0, express_1.default)();
         this.app.disable('x-powered-by');
         this.app.disable('etag');
@@ -53,7 +63,8 @@ class LocalDevelopmentServer {
         await stopServer(this.httpServer);
     }
     async compileAndWatch(watch, tunnelOptions = cli_shared_1.defaultNoDebugTunnelOptions) {
-        const watchMode = tunnelOptions.debug ? 'debug' : 'watch';
+        this.tunnelOptions = tunnelOptions;
+        const watchMode = this.tunnelOptions.debug ? 'debug' : 'watch';
         const handlers = await this.configFile.getAppHandlers();
         const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
         if (!entryPoints.length) {
@@ -74,6 +85,9 @@ class LocalDevelopmentServer {
     getApp() {
         return this.app;
     }
+    setErrorHandler(handler) {
+        this.onFatalError = handler;
+    }
     handleInvocation = async (req, res) => {
         const request = req.body;
         const envVars = (0, runtime_1.getUserVars)();
@@ -82,6 +96,7 @@ class LocalDevelopmentServer {
                 envVars.push(item);
             }
         });
+        await this.validateApp(request);
         request.variables = [...envVars].sort((a, b) => a.key.localeCompare(b.key));
         try {
             const invokeResults = await this.invocationService.invoke(request.handler, request);
@@ -130,5 +145,33 @@ class LocalDevelopmentServer {
             }
         })(req, res, next);
     };
+    async validateApp(request) {
+        try {
+            if (!(await this.statsigService.isSelfManagedTunnelEnabled())) {
+                return;
+            }
+            await this.setEnvironmentAndAppId();
+            const requestAppId = request?._meta?.appContext?.appId;
+            if (requestAppId && requestAppId !== this.appId) {
+                throw new TunnelInvocationValidationError(cli_shared_1.Text.tunnel.error.invalidInvokeRequestForAppId(requestAppId));
+            }
+            const requestEnvId = request?._meta?.appContext?.environmentId;
+            if (requestEnvId && requestEnvId !== this.environmentId) {
+                throw new TunnelInvocationValidationError(cli_shared_1.Text.tunnel.error.invalidInvokeRequestForAppEnv(requestEnvId));
+            }
+        }
+        catch (error) {
+            await this.onFatalError?.(error);
+        }
+    }
+    async setEnvironmentAndAppId() {
+        if (this.environmentId && this.appId) {
+            return;
+        }
+        const config = await this.configFile.readConfig();
+        this.appId = ari_1.EcosystemAppAri.parse(config.app.id).appId;
+        const environmentKey = this.tunnelOptions?.environment || 'default';
+        this.environmentId = await this.appEnvironmentClient.getAppEnvironmentId(config.app.id, environmentKey);
+    }
 }
 exports.LocalDevelopmentServer = LocalDevelopmentServer;

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

@@ -35,7 +35,7 @@ export declare abstract class ResourceTunnelServer {
             scripts?: import("@forge/manifest").Scripts1 | undefined;
             styles?: import("@forge/manifest").Styles1 | undefined;
         };
-        detection?: "app-check" | undefined;
+        enforcement?: "app-managed" | undefined;
         configurable?: {
             [k: string]: unknown;
             enabled: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "6.2.2-next.3-experimental-1a0bb6a",
+  "version": "6.3.0-next.10",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -11,13 +11,15 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "6.1.9-next.3-experimental-1a0bb6a",
-    "@forge/cli-shared": "8.7.2-next.1-experimental-1a0bb6a",
-    "@forge/csp": "5.1.1-next.0-experimental-1a0bb6a",
-    "@forge/runtime": "6.0.4",
+    "@forge/bundler": "6.1.9-next.10",
+    "@forge/cli-shared": "8.8.0-next.8",
+    "@forge/csp": "5.1.1-next.0",
+    "@forge/runtime": "6.1.0-next.0",
+    "@forge/util": "^2.0.0",
     "cheerio": "^1.1.0",
     "chokidar": "^3.6.0",
     "cloudflared": "^0.7.0",
+    "docker-compose": "^1.3.0",
     "express": "^4.18.3",
     "express-intercept": "^1.1.1",
     "http-proxy-middleware": "^2.0.9",
@@ -31,7 +33,7 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^4.2.0",
-    "@forge/manifest": "10.7.0-next.0-experimental-1a0bb6a",
+    "@forge/manifest": "10.7.0-next.4",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.14",
     "@types/node": "20.19.1",