@forge/tunnel 3.0.1-next.2 → 3.1.0-next.10

package/CHANGELOG.md

@@ -1,5 +1,72 @@
 # @forge/tunnel
 
+## 3.1.0-next.10
+
+### Patch Changes
+
+- @forge/bundler@4.4.0-next.9
+
+## 3.1.0-next.9
+
+### Patch Changes
+
+- Updated dependencies [d71279f]
+  - @forge/cli-shared@3.6.0-next.1
+  - @forge/bundler@4.4.0-next.8
+
+## 3.1.0-next.8
+
+### Patch Changes
+
+- Updated dependencies [8c60d162]
+  - @forge/cli-shared@3.6.0-next.0
+  - @forge/bundler@4.4.0-next.7
+
+## 3.1.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [ceb1141]
+  - @forge/bundler@4.4.0-next.6
+  - @forge/runtime@4.1.0-next.2
+
+## 3.1.0-next.6
+
+### Patch Changes
+
+- Updated dependencies [addbda1]
+  - @forge/bundler@4.4.0-next.5
+
+## 3.1.0-next.5
+
+### Minor Changes
+
+- e25c75e8: Update Node runtime response payload
+
+### Patch Changes
+
+- Updated dependencies [e25c75e8]
+  - @forge/bundler@4.4.0-next.4
+  - @forge/runtime@4.1.0-next.1
+
+## 3.1.0-next.4
+
+### Patch Changes
+
+- c0ecd442: Fix Custom UI tunnelling on Node runtime
+
+## 3.1.0-next.3
+
+### Minor Changes
+
+- d98339a: Non-Docker tunnel for Node runtime
+
+### Patch Changes
+
+- Updated dependencies [d98339a]
+  - @forge/bundler@4.4.0-next.3
+  - @forge/runtime@4.0.1-next.0
+
 ## 3.0.1-next.2
 
 ### Patch Changes

package/out/command/interactors/function-change-watcher.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { MakeDirectoryOptions } from 'fs';
-import { ConfigFile, Logger } from '@forge/cli-shared';
+import { ConfigFile, FeatureFlagReader, Logger } from '@forge/cli-shared';
 import { BundlerOutput } from '@forge/bundler';
 import { Sandbox, SandboxConfig, SnapshotCreator } from '@forge/runtime';
 export interface FunctionChangeWatcher {
@@ -25,8 +25,9 @@ export declare class LocalFunctionHost implements FunctionChangeWatcher {
     private readonly snapshot;
     private readonly createSandbox;
     private readonly fsInteractor;
+    private readonly featureFlags;
     private snapshotLogs;
-    constructor(configFile: ConfigFile, logger: Logger, snapshot: SnapshotCreator, createSandbox: (cfg: SandboxConfig) => Promise<Sandbox>, fsInteractor: FsInteractor);
+    constructor(configFile: ConfigFile, logger: Logger, snapshot: SnapshotCreator | null, createSandbox: (cfg: SandboxConfig) => Promise<Sandbox>, fsInteractor: FsInteractor, featureFlags: FeatureFlagReader);
     private generateBundleFiles;
     startWatching(bundledCode: BundlerOutput): Promise<void>;
     stopWatching(): Promise<void>;

package/out/command/interactors/function-change-watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAG1C,OAAO,EAAE,UAAU,EAA8B,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAIL,OAAO,EACP,aAAa,EACb,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,MAAM;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAP/B,OAAO,CAAC,YAAY,CAA8C;gBAG/C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,EACzB,aAAa,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,EACvD,YAAY,EAAE,YAAY;YAG/B,mBAAmB;IAuBpB,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CxD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;CAsBlC"}
+{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,IAAI,CAAC;AAG1C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAA8B,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAIL,OAAO,EACP,aAAa,EACb,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,MAAM;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,qBAAa,iBAAkB,YAAW,qBAAqB;IAI3D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,YAAY,CAA8C;gBAG/C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,eAAe,GAAG,IAAI,EAChC,aAAa,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,EACvD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,iBAAiB;YAGpC,mBAAmB;IA2BpB,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CxD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;CAsBlC"}

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

@@ -10,12 +10,13 @@ const util_1 = require("../../util");
 exports.INVOCATION_TIMEOUT = 10;
 exports.MEMORY_LIMIT = 256;
 class LocalFunctionHost {
-    constructor(configFile, logger, snapshot, createSandbox, fsInteractor) {
+    constructor(configFile, logger, snapshot, createSandbox, fsInteractor, featureFlags) {
         this.configFile = configFile;
         this.logger = logger;
         this.snapshot = snapshot;
         this.createSandbox = createSandbox;
         this.fsInteractor = fsInteractor;
+        this.featureFlags = featureFlags;
         this.snapshotLogs = [];
         this.onRuntimeLog = (event) => {
             this.logger.info((0, util_1.formatRuntimeLog)(event));
@@ -24,6 +25,9 @@ class LocalFunctionHost {
     async generateBundleFiles(bundle, withSnapshot) {
         await this.fsInteractor.mkdir((0, path_1.dirname)(bundle.bundleFilePath), { recursive: true });
         if (withSnapshot) {
+            if (!this.snapshot) {
+                throw new Error('Snapshot requested but snapshot creator not provided.');
+            }
             const snapshotOutput = await this.snapshot({ isolateMemory: exports.MEMORY_LIMIT }, Buffer.from(bundle.bundleFileContent), bundle.bundleFilePath, bundle.bundleFileSourceMap ? Buffer.from(bundle.bundleFileSourceMap) : undefined);
             await this.fsInteractor.writeFile(bundle.bundleFilePath + '.snapshot', Buffer.from(snapshotOutput.buffer));
             if (snapshotOutput.logs.length > 0) {
@@ -39,7 +43,7 @@ class LocalFunctionHost {
     }
     async startWatching(bundledCode) {
         const directory = tmp_1.default.dirSync({ prefix: 'tunnel' }).name;
-        const isSnapshotEnabled = await this.configFile.snapshotsEnabled();
+        const isSnapshotEnabled = (await this.configFile.snapshotsEnabled()) && !(await this.featureFlags.isNodeRuntime());
         if (isSnapshotEnabled) {
             this.logger.info('');
             this.logger.info(cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.tunnel.snapshotting));

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

@@ -7,7 +7,9 @@ import { TunnelDefinitions } from '../index';
 import { RegisterTunnelService, CreateTunnelService } from '../services';
 export interface StartTunnelOptions {
     port?: number;
+    host: string;
     environmentKey: string;
+    resourcePortMap?: Record<string, number>;
 }
 export interface StartTunnelResult {
     localPort: number;

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,EAAyB,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAG9D,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,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;AACzE,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,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,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,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,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CAUlB;IAEF,OAAO,CAAC,qBAAqB,CAS3B;IAEF,OAAO,CAAC,gCAAgC,CAgCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAoD9E"}
+{"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,EAAyB,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAG9D,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,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;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,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,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,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CAUlB;IAEF,OAAO,CAAC,qBAAqB,CAS3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAoD9E"}

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

@@ -36,20 +36,20 @@ class StartTunnelCommand {
             const faasTunnelUrl = await this.tunnelFactory.establishTunnel(serverInfo.port);
             return Object.assign(Object.assign({}, serverInfo), { tunnelUrl: faasTunnelUrl });
         };
-        this.startResourceBasedTunnelsServers = async (resourceDetails) => {
-            var _a, _b;
-            const resourcePortMap = JSON.parse((_a = process.env.RESOURCE_PORT_MAP) !== null && _a !== void 0 ? _a : '{}');
+        this.startResourceBasedTunnelsServers = async (resourceDetails, options) => {
+            var _a, _b, _c;
+            const portMap = (_a = options.resourcePortMap) !== null && _a !== void 0 ? _a : JSON.parse((_b = process.env.RESOURCE_PORT_MAP) !== null && _b !== void 0 ? _b : '{}');
             const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
-            const cspReporterPort = parseInt((_b = process.env.CSP_REPORTER_PORT) !== null && _b !== void 0 ? _b : '4000', 10);
+            const cspReporterPort = parseInt((_c = process.env.CSP_REPORTER_PORT) !== null && _c !== void 0 ? _c : '4000', 10);
             if (resourceDetails.length === 0)
                 return [];
             this.cspReporterServer = new servers_1.CspReporterServer(cspReporterPort, this.logger, new node_cache_1.default());
             await this.cspReporterServer.start();
             return await Promise.all(resourceDetails.map(async (rd) => {
                 const { key, resourceType } = rd;
-                const port = resourcePortMap[key];
+                const port = portMap[key];
                 const tunnelServer = resourceType === 'nativeUI' ? servers_1.NativeUITunnelServer : servers_1.CustomUITunnelServer;
-                this.tunnelServers[key] = new tunnelServer(Object.assign(Object.assign({}, rd), { port, logger: this.logger, cspReporterServerPort: cspReporterPort, permissions,
+                this.tunnelServers[key] = new tunnelServer(Object.assign(Object.assign({}, rd), { port, host: options.host, logger: this.logger, cspReporterServerPort: cspReporterPort, permissions,
                     remotes }));
                 return this.tunnelServers[key].start();
             }));
@@ -61,7 +61,7 @@ class StartTunnelCommand {
         const allResources = await this.configFile.getResources();
         try {
             const faasTunnelServer = await this.startFaaSTunnelServer(port);
-            const customUITunnelsServers = await this.startResourceBasedTunnelsServers(allResources);
+            const customUITunnelsServers = await this.startResourceBasedTunnelsServers(allResources, options);
             const tunnelDefinitions = {
                 faasTunnelUrl: faasTunnelServer.tunnelUrl,
                 customUI: customUITunnelsServers.map(({ tunnelUrl, resourceKey }) => ({

package/out/servers/custom-ui-tunnel-server.d.ts.map

@@ -1 +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,EAAoB,MAAM,0BAA0B,CAAC;AAE5G,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AASvE,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;IAwC3D,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAkBhD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAcd,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC;IAK5C,MAAM,IAAI,OAAO;IAIjB,OAAO,CAAC,gCAAgC;IAoBxC,OAAO,CAAC,sBAAsB;CAO/B"}
+{"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,EAAc,MAAM,cAAc,CAAC;AASnF,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;IAwC3D,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"}

package/out/servers/custom-ui-tunnel-server.js

@@ -7,6 +7,7 @@ const express_1 = tslib_1.__importDefault(require("express"));
 const http_proxy_middleware_1 = require("http-proxy-middleware");
 const resource_tunnel_server_1 = require("./resource-tunnel-server");
 const cli_shared_1 = require("@forge/cli-shared");
+const dev_server_1 = require("./dev-server");
 var ConnectionErrorCode;
 (function (ConnectionErrorCode) {
     ConnectionErrorCode["REFUSED"] = "ECONNREFUSED";
@@ -21,7 +22,7 @@ class CustomUITunnelServer extends resource_tunnel_server_1.ResourceTunnelServer
         if (tunnel) {
             const { port: tunnelPort } = tunnel;
             this.proxy = (0, http_proxy_middleware_1.createProxyMiddleware)({
-                target: `http://${resource_tunnel_server_1.TUNNEL_LOCALHOST}:${tunnelPort}`,
+                target: `http://${this.tunnelArgs.host}:${tunnelPort}`,
                 ws: true,
                 logLevel: 'info',
                 logProvider: () => {
@@ -67,12 +68,7 @@ class CustomUITunnelServer extends resource_tunnel_server_1.ResourceTunnelServer
         if (this.socket) {
             this.socket.end();
         }
-        return new Promise((resolve, reject) => {
-            if (!this.server) {
-                return resolve();
-            }
-            this.server.close((err) => (err ? reject(err) : resolve()));
-        });
+        await (0, dev_server_1.stopServer)(this.server);
     }
     async compileAndWatch() {
         return {};

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

@@ -1,7 +1,9 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import express from 'express';
+import * as http from 'http';
 import { URL } from 'url';
-import { ConfigFile, Logger } from '@forge/cli-shared';
+import { ConfigFile, FeatureFlagReader, Logger } from '@forge/cli-shared';
 import { ExternalRequestBody } from '@forge/runtime';
 import { Permissions, Remotes } from '@forge/manifest';
 import { BundlerOutput } from '@forge/bundler';
@@ -23,15 +25,17 @@ export interface StartDevServerResult {
 export interface InvocationService {
     invoke(handler: string, request: ExternalRequestBody): Promise<any>;
 }
+export declare function stopServer(server: http.Server | undefined): Promise<void>;
 export declare class LocalDevelopmentServer implements DevelopmentServer {
     private readonly invocationService;
     private readonly logger;
     private readonly configFile;
+    private readonly featureFlags;
     private app;
     private httpServer;
     private permissions;
     private remotes;
-    constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile);
+    constructor(invocationService: InvocationService, logger: Logger, configFile: ConfigFile, featureFlags: FeatureFlagReader);
     start(port?: number, permissions?: Permissions, remotes?: Remotes): Promise<StartDevServerResult>;
     stop(): Promise<void>;
     compileAndWatch({ onBuildWillStart, onBuildFinished }: WatchHooks<BundlerOutput>): Promise<BundlerOutput | undefined>;

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,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAY,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,aAAa,EAKd,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,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,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACjE;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,qBAAa,sBAAuB,YAAW,iBAAiB;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,OAAO,CAAsB;gBAGlB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAQ5B,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAUJ,eAAe,CAAC,EAC3B,gBAAgB,EAChB,eAAe,EAChB,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAiD1D,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAsCtC;CACH"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/servers/dev-server.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAY,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAe,MAAM,gBAAgB,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,aAAa,EAMd,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AACD,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,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACjE;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;IAO5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAT/B,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,OAAO,CAAsB;gBAGlB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,iBAAiB;IAQrC,KAAK,CAAC,IAAI,SAAI,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAe5F,IAAI;IAIJ,eAAe,CAAC,EAC3B,gBAAgB,EAChB,eAAe,EAChB,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAqD1D,MAAM,IAAI,OAAO,CAAC,WAAW;IAI7B,gBAAgB,EAAE,OAAO,CAAC,OAAO,CA2CtC;CACH"}

package/out/servers/dev-server.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalDevelopmentServer = void 0;
+exports.LocalDevelopmentServer = exports.stopServer = void 0;
 const tslib_1 = require("tslib");
 const express_1 = tslib_1.__importDefault(require("express"));
 const bundler_1 = require("@forge/bundler");
@@ -9,11 +9,21 @@ const runtime_1 = require("@forge/runtime");
 const __1 = require("../");
 const util_1 = require("../util");
 const bundler_2 = require("@forge/bundler");
+async function stopServer(server) {
+    if (!server) {
+        return;
+    }
+    return new Promise((resolve) => {
+        server.close(() => resolve());
+    });
+}
+exports.stopServer = stopServer;
 class LocalDevelopmentServer {
-    constructor(invocationService, logger, configFile) {
+    constructor(invocationService, logger, configFile, featureFlags) {
         this.invocationService = invocationService;
         this.logger = logger;
         this.configFile = configFile;
+        this.featureFlags = featureFlags;
         this.handleInvocation = async (req, res) => {
             var _a, _b, _c, _d, _e, _f;
             const request = req.body;
@@ -33,6 +43,9 @@ class LocalDevelopmentServer {
             request._meta = Object.assign(Object.assign({}, request._meta), { fetchAllowList: allowList });
             try {
                 const invokeResults = await this.invocationService.invoke(request.handler, request);
+                if ((await this.featureFlags.isNodeRuntime()) && !invokeResults.success) {
+                    return res.status(500).send(invokeResults.error);
+                }
                 res.json(invokeResults);
             }
             catch (error) {
@@ -61,12 +74,7 @@ class LocalDevelopmentServer {
         };
     }
     async stop() {
-        if (!this.httpServer) {
-            return;
-        }
-        const server = this.httpServer;
-        this.httpServer = undefined;
-        await new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve())));
+        await stopServer(this.httpServer);
     }
     async compileAndWatch({ onBuildWillStart, onBuildFinished }) {
         const handlers = await this.configFile.getAppHandlers();
@@ -74,7 +82,10 @@ class LocalDevelopmentServer {
         if (!entryPoints.length) {
             return;
         }
-        const config = (0, bundler_2.getSandboxedRuntimeBuildConfig)(entryPoints, {
+        const getConfig = (await this.featureFlags.isNodeRuntime())
+            ? bundler_2.getNodeRuntimeBuildConfig
+            : bundler_2.getSandboxedRuntimeBuildConfig;
+        const config = getConfig(entryPoints, {
             isWatchMode: true,
             isDebugMode: (0, __1.isInspectorEnabled)(),
             appDirectory: process.cwd()

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

@@ -5,12 +5,12 @@ import { CSPDetails } from '@forge/csp';
 import type { Permissions, Remotes } from '@forge/manifest';
 export interface ResourceTunnelServerArgs extends Resource {
     port: number;
+    host: string;
     logger: Logger;
     permissions: Permissions;
     cspReporterServerPort: number;
     remotes: Remotes;
 }
-export declare const TUNNEL_LOCALHOST: string;
 export declare abstract class ResourceTunnelServer {
     protected readonly port: number;
     protected readonly key: string;

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

@@ -1 +1 @@
-{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/resource-tunnel-server.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,EAMR,MAAM,EAEP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA6C,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG5D,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;AAED,eAAO,MAAM,gBAAgB,QAAsE,CAAC;AAEpG,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAQxF,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;IAajF,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAMvF,SAAS,CAAC,YAAY,gBAAiB,UAAU,KAAG,MAAM,CAO1C;IAEhB,SAAS,CAAC,wBAAwB,gBAAiB,MAAM,YAGpD;IAEL,SAAS,CAAC,yBAAyB,gBAAiB,MAAM,YAGrD;IAEL,SAAS,CAAC,kCAAkC,gBAAiB,WAAW,uBAAqB,cAAc,CAqBpG;CACR"}
+{"version":3,"file":"resource-tunnel-server.d.ts","sourceRoot":"","sources":["../../src/servers/resource-tunnel-server.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,EAMR,MAAM,EAEP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAA6C,MAAM,YAAY,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG5D,MAAM,WAAW,wBAAyB,SAAQ,QAAQ;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,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;AAED,8BAAsB,oBAAoB;IACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;gBAE5B,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,EAAE,wBAAwB;IAQxF,MAAM,CAAC,+BAA+B,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;IAajF,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAMvF,SAAS,CAAC,YAAY,gBAAiB,UAAU,KAAG,MAAM,CAO1C;IAEhB,SAAS,CAAC,wBAAwB,gBAAiB,MAAM,YAGpD;IAEL,SAAS,CAAC,yBAAyB,gBAAiB,MAAM,YAGrD;IAEL,SAAS,CAAC,kCAAkC,gBAAiB,WAAW,uBAAqB,cAAc,CAqBpG;CACR"}

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourceTunnelServer = exports.TUNNEL_LOCALHOST = void 0;
+exports.ResourceTunnelServer = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const csp_1 = require("@forge/csp");
 const express_intercept_1 = require("express-intercept");
-exports.TUNNEL_LOCALHOST = process.env.FORGE_DEV_TUNNEL ? 'localhost' : 'host.docker.internal';
 class ResourceTunnelServer {
     constructor({ port, key, path, cspReporterServerPort, logger }) {
         this.getCspHeader = (existingCsp) => new csp_1.CSPInjectionService()

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

@@ -43,7 +43,7 @@ class LocalInvocationService {
             ctx: { requestId, traceId: requestId, timeout: interactors_1.INVOCATION_TIMEOUT }
         });
         const invocationLimits = (0, runtime_1.perInvocationLimitsTrackerFactory)(xenInvocationRequest);
-        const { body, metrics } = await (0, runtime_1.invoke)({
+        const { body, metrics, success, error } = await (0, runtime_1.invoke)({
             sandbox,
             xenInvocationRequest,
             invocationLimits,
@@ -51,7 +51,7 @@ class LocalInvocationService {
         });
         const reportMetrics = xenInvocationRequest.isFeatureFlagEnabled(runtime_1.XEN_RUNTIME_SHOULD_REPORT_METRICS);
         LocalInvocationService.printMetrics(reportMetrics, metrics, this.logger);
-        return reportMetrics ? { body, metrics } : body;
+        return reportMetrics ? { body, metrics, success, error } : body;
     }
 }
 exports.LocalInvocationService = LocalInvocationService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "3.0.1-next.2",
+  "version": "3.1.0-next.10",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -11,10 +11,10 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "4.4.0-next.2",
-    "@forge/cli-shared": "3.5.1",
+    "@forge/bundler": "4.4.0-next.9",
+    "@forge/cli-shared": "3.6.0-next.1",
     "@forge/csp": "^2.1.0",
-    "@forge/runtime": "4.0.0",
+    "@forge/runtime": "4.1.0-next.2",
     "express": "^4.17.1",
     "express-intercept": "^0.8.10",
     "http-proxy-middleware": "^1.0.6",