@forge/tunnel 4.0.9-next.0 → 4.1.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @forge/tunnel
 
+## 4.1.0-next.2
+
+### Patch Changes
+
+- @forge/bundler@4.15.9-next.2
+
+## 4.1.0-next.1
+
+### Minor Changes
+
+- c43a07c: enable nodejs runtime debugger
+
+### Patch Changes
+
+- Updated dependencies [c43a07c]
+  - @forge/cli-shared@3.26.0-next.0
+  - @forge/runtime@5.6.0-next.0
+  - @forge/bundler@4.15.9-next.1
+
 ## 4.0.9-next.0
 
 ### Patch Changes

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

@@ -1,8 +1,8 @@
-import { ConfigFile, Logger } from '@forge/cli-shared';
+import { ConfigFile, Logger, TunnelOptions } from '@forge/cli-shared';
 import { BundlerOutput } from '@forge/bundler';
 import { Sandbox, SandboxConfig, SnapshotCreator } from '@forge/runtime';
 export interface FunctionChangeWatcher {
-    startWatching(bundledCode: BundlerOutput): Promise<void>;
+    startWatching(bundledCode: BundlerOutput, tunnelOptions: TunnelOptions): Promise<void>;
     stopWatching(): Promise<void>;
 }
 export interface Bundle {
@@ -20,9 +20,10 @@ export declare class LocalFunctionHost implements FunctionChangeWatcher {
     private snapshotLogs;
     constructor(configFile: ConfigFile, logger: Logger, snapshot: SnapshotCreator | null, createSandbox: (cfg: SandboxConfig) => Promise<Sandbox>);
     private generateBundleFiles;
-    startWatching(bundledCode: BundlerOutput): Promise<void>;
+    startWatching(bundledCode: BundlerOutput, tunnelOptions?: TunnelOptions): Promise<void>;
     stopWatching(): Promise<void>;
     private onRuntimeLog;
     private initializeSandboxes;
+    static getDebuggerPort(modName: string, handler: string, tunnelOptions: TunnelOptions): number | undefined;
 }
 //# sourceMappingURL=function-change-watcher.d.ts.map

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":"AAGA,OAAO,EAAE,UAAU,EAA8B,MAAM,EAAqB,MAAM,mBAAmB,CAAC;AACtG,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,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,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;IANhC,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;YAG5D,mBAAmB;IA2BpB,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDxD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;CAqBlC"}
+{"version":3,"file":"function-change-watcher.d.ts","sourceRoot":"","sources":["../../../src/command/interactors/function-change-watcher.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAA8B,MAAM,EAAqB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrH,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,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvF,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;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,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;IANhC,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;YAG5D,mBAAmB;IA2BpB,aAAa,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3F,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,OAAO,CAAC,YAAY,CAElB;YAEY,mBAAmB;WAuBnB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa;CAY7F"}

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

@@ -39,7 +39,7 @@ class LocalFunctionHost {
             await fs_1.promises.writeFile(bundle.bundleFileSourceMapPath, bundle.bundleFileSourceMap);
         }
     }
-    async startWatching(bundledCode) {
+    async startWatching(bundledCode, tunnelOptions = {}) {
         const directory = tmp_1.default.dirSync({ prefix: 'tunnel' }).name;
         const isSnapshotEnabled = (await this.configFile.snapshotsEnabled()) && !((await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs);
         if (isSnapshotEnabled) {
@@ -78,13 +78,13 @@ class LocalFunctionHost {
                 this.logger.info('');
             }
         }
-        await this.initializeSandboxes(directory);
+        await this.initializeSandboxes(directory, tunnelOptions);
         runtime_1.StaticInvocationEventEmitter.addListener(runtime_1.EVENT_P3_LOG, this.onRuntimeLog);
     }
     async stopWatching() {
         runtime_1.StaticInvocationEventEmitter.removeAllListeners();
     }
-    async initializeSandboxes(srcPath) {
+    async initializeSandboxes(srcPath, tunnelOptions) {
         try {
             const handlers = await this.configFile.getAppHandlers();
             const sandboxes = {};
@@ -93,7 +93,8 @@ class LocalFunctionHost {
                     modName: module,
                     appPath: srcPath,
                     handler: func,
-                    isolateMemory: exports.MEMORY_LIMIT
+                    isolateMemory: exports.MEMORY_LIMIT,
+                    debugPort: LocalFunctionHost.getDebuggerPort(module, func, tunnelOptions)
                 });
             }));
             util_1.SandboxesContainer.updateSandboxes(sandboxes);
@@ -102,5 +103,16 @@ class LocalFunctionHost {
             this.logger.error(error);
         }
     }
+    static getDebuggerPort(modName, handler, tunnelOptions) {
+        const sandboxName = `${modName}.${handler}`;
+        if (!tunnelOptions || !tunnelOptions.debug) {
+            return undefined;
+        }
+        const index = (tunnelOptions.debugFunctionHandlers || []).findIndex((handler) => handler === sandboxName);
+        if (index === -1) {
+            return undefined;
+        }
+        return index + (tunnelOptions.debugStartingPort || 9229);
+    }
 }
 exports.LocalFunctionHost = LocalFunctionHost;

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

@@ -1,10 +1,10 @@
 import { WatcherMonitor } from '@forge/bundler';
-import { Logger } from '@forge/cli-shared';
+import { Logger, TunnelOptions } from '@forge/cli-shared';
 import { StartTunnelResult } from '../start-tunnel-command';
 export declare class TunnelInteractor {
     private readonly logger;
     constructor(logger: Logger);
     handleUserExitEvent(stopFunction: () => Promise<void>, bundleMonitor: WatcherMonitor | undefined): Promise<void>;
-    watchApp: (startTunnelResult: StartTunnelResult) => Promise<WatcherMonitor | undefined>;
+    watchApp: (startTunnelResult: StartTunnelResult, tunnelOptions?: TunnelOptions) => Promise<WatcherMonitor | undefined>;
 }
 //# sourceMappingURL=tunnel-interactor.d.ts.map

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,EAAY,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,qBAAa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAEpC,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,GACxC,OAAO,CAAC,IAAI,CAAC;IAqCT,QAAQ,sBAA6B,iBAAiB,KAAG,QAAQ,cAAc,GAAG,SAAS,CAAC,CA6DjG;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,EAAY,MAAM,EAAQ,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,qBAAa,gBAAgB;IACf,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IAEpC,mBAAmB,CACxB,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACjC,aAAa,EAAE,cAAc,GAAG,SAAS,GACxC,OAAO,CAAC,IAAI,CAAC;IAqCT,QAAQ,sBACM,iBAAiB,kBACrB,aAAa,KAC3B,QAAQ,cAAc,GAAG,SAAS,CAAC,CA6DpC;CACH"}

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

@@ -9,7 +9,7 @@ const multi_compiler_watcher_1 = require("./multi-compiler-watcher");
 class TunnelInteractor {
     constructor(logger) {
         this.logger = logger;
-        this.watchApp = async (startTunnelResult) => {
+        this.watchApp = async (startTunnelResult, tunnelOptions = {}) => {
             const { localPort, inspectorAddress, reloadSandboxes, devServers } = startTunnelResult;
             if (inspectorAddress) {
                 this.logger.info(cli_shared_1.Text.tunnel.startedInspector(inspectorAddress));
@@ -31,7 +31,7 @@ class TunnelInteractor {
                     return;
                 }
                 if (output) {
-                    await reloadSandboxes(output);
+                    await reloadSandboxes(output, tunnelOptions);
                 }
                 this.logger.info('');
                 this.logger.info(cli_shared_1.Text.tunnel.startedServer(localPort, this.logger.debugEnabled) + '\n');
@@ -47,7 +47,7 @@ class TunnelInteractor {
                             onBuildFinished: onBundlingFinish
                         }
                     });
-                    await reloadSandboxes(output);
+                    await reloadSandboxes(output, tunnelOptions);
                     this.logger.info('');
                     this.logger.info(cli_shared_1.Text.tunnel.startedServer(localPort, this.logger.debugEnabled) + '\n');
                 }

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

@@ -1,5 +1,5 @@
 import { BundlerOutput } from '@forge/bundler';
-import { AppConfigProvider, ConfigFile, Logger } from '@forge/cli-shared';
+import { AppConfigProvider, ConfigFile, Logger, TunnelOptions } from '@forge/cli-shared';
 import { Inspector } from '@forge/runtime';
 import { DevelopmentServer } from '../servers';
 import { FunctionChangeWatcher } from './interactors';
@@ -18,7 +18,7 @@ export interface StartTunnelResult {
     inspectorAddress?: string;
     devServers: DevelopmentServer[];
     stopFunction(): Promise<void>;
-    reloadSandboxes(bundledCode: BundlerOutput): Promise<void>;
+    reloadSandboxes(bundledCode: BundlerOutput, tunnelOptions: TunnelOptions): Promise<void>;
 }
 export declare class StartTunnelCommand {
     private readonly getAppConfig;

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,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,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,CAe3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;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,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChH,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,WAAW,EAAE,MAAM,CAAC;IACpB,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,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,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,CAe3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAoD9E"}

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

@@ -72,10 +72,10 @@ class StartTunnelCommand {
             await this.tunnelClient.registerTunnels(appId, environmentKey, tunnelDefinitions);
             const inspectorAddress = (0, index_1.isInspectorEnabled)() ? this.inspector.startServer(index_1.INSPECTOR_PORT) : undefined;
             const stopFunction = async () => this.stopServices(appId, environmentKey);
-            const reloadSandboxes = async (bundledCode) => {
+            const reloadSandboxes = async (bundledCode, tunnelOptions) => {
                 await this.functionHost.stopWatching();
                 try {
-                    await this.functionHost.startWatching(bundledCode);
+                    await this.functionHost.startWatching(bundledCode, tunnelOptions);
                 }
                 catch (e) {
                     if (e instanceof runtime_1.SnapshotCodeError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "4.0.9-next.0",
+  "version": "4.1.0-next.2",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -11,10 +11,10 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "4.15.9-next.0",
-    "@forge/cli-shared": "3.25.2",
+    "@forge/bundler": "4.15.9-next.2",
+    "@forge/cli-shared": "3.26.0-next.0",
     "@forge/csp": "3.2.1",
-    "@forge/runtime": "5.5.0",
+    "@forge/runtime": "5.6.0-next.0",
     "express": "^4.18.3",
     "express-intercept": "^1.1.0",
     "http-proxy-middleware": "^2.0.6",