@forge/cli 8.0.1 → 8.1.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/cli
 
+## 8.1.0-next.0
+
+### Minor Changes
+
+- e6ce012: support debug during tunnel for runtime v2
+
+### Patch Changes
+
+- @forge/bundler@4.15.9-next.0
+- @forge/node-runtime@0.10.1-next.0
+- @forge/tunnel@4.0.9-next.0
+
 ## 8.0.1
 
 ### Patch Changes

package/npm-shrinkwrap.json

@@ -1,23 +1,23 @@
 {
   "name": "@forge/cli",
-  "version": "8.0.1",
+  "version": "8.1.0-next.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@forge/cli",
-      "version": "8.0.1",
+      "version": "8.1.0-next.0",
       "hasInstallScript": true,
       "license": "UNLICENSED",
       "dependencies": {
-        "@forge/bundler": "4.15.8",
+        "@forge/bundler": "4.15.9-next.0",
         "@forge/cli-shared": "3.25.2",
         "@forge/egress": "1.2.13",
         "@forge/lint": "4.0.10",
         "@forge/manifest": "6.3.1",
-        "@forge/node-runtime": "0.10.0",
+        "@forge/node-runtime": "0.10.1-next.0",
         "@forge/runtime": "5.5.0",
-        "@forge/tunnel": "4.0.8",
+        "@forge/tunnel": "4.0.9-next.0",
         "@forge/util": "1.4.2",
         "@sentry/node": "7.100.1",
         "ajv": "^8.12.0",
@@ -878,9 +878,9 @@
       "integrity": "sha512-zG50ZRzbKyWHVb/XjI6iCIyyDNmSHdlclvehMjFZ/A3qpHExjSCjaszeY6gBDJKD2GORKKjQ3LS1UyRpiVVvkA=="
     },
     "node_modules/@forge/bundler": {
-      "version": "4.15.8",
-      "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.8.tgz",
-      "integrity": "sha512-bE1Co4WYDr6YGiHnCIio5v2G56eB/sb49z8PlfeAmYErrhx1YoWXxdngA5bKLPhjBd3mho9wucrT/pfQDK97Pg==",
+      "version": "4.15.9-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-4.15.9-next.0.tgz",
+      "integrity": "sha512-yP9g7FeWNm5QFsGvcEu18+BaU0EdWxUHG0/MRiaUE/b7grBITQCM82SzTJi3nE69pWXbekaXE548XXN0rLuPhA==",
       "dependencies": {
         "@babel/core": "^7.24.0",
         "@babel/plugin-transform-class-properties": "^7.23.3",
@@ -889,11 +889,11 @@
         "@babel/plugin-transform-optional-chaining": "^7.23.4",
         "@babel/plugin-transform-react-jsx": "^7.23.4",
         "@babel/preset-typescript": "^7.23.3",
-        "@forge/api": "3.3.1",
+        "@forge/api": "3.4.0-next.0",
         "@forge/babel-plugin-transform-ui": "1.1.18",
         "@forge/cli-shared": "3.25.2",
         "@forge/lint": "4.0.10",
-        "@forge/node-runtime": "0.10.0",
+        "@forge/node-runtime": "0.10.1-next.0",
         "@forge/util": "1.4.2",
         "assert": "^2.1.0",
         "babel-loader": "^8.3.0",
@@ -932,9 +932,9 @@
       }
     },
     "node_modules/@forge/bundler/node_modules/@forge/api": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.3.1.tgz",
-      "integrity": "sha512-pYtRzE0Baevc6kppLHKzt7zENDMcwWsgJNLlN9WjPUR6K8DKzq96EzS1k2ln3PAqG3QjVMPIB9m8LW3DPXFJJg==",
+      "version": "3.4.0-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.4.0-next.0.tgz",
+      "integrity": "sha512-GQ0VmedjuXeKGdI3YEZMGtr7aBb8L2ifO/DYTaY8W6b0lWu1Kl2yKaWahYWUjXWoV8Jyzyhcy+dgNLZHKLLhaQ==",
       "dependencies": {
         "@forge/auth": "0.0.5",
         "@forge/egress": "1.2.13",
@@ -1037,20 +1037,20 @@
       }
     },
     "node_modules/@forge/node-runtime": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.10.0.tgz",
-      "integrity": "sha512-inAXk/teiJeFDw36qWepCxGWPaF0ZyVl0iQtS0RnMp1mmFCoCwID5Zm9yDuM4u/brVpjhp1Db1Ww4HSuW6wDBg==",
+      "version": "0.10.1-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/node-runtime/-/node-runtime-0.10.1-next.0.tgz",
+      "integrity": "sha512-BPkLmMH3fIKmKxztKp5CQYiQbj8Icxa/n0ARy3PII2TBg3CZz+Yj6FPeufhd8x43k5s/dBwwsgP6rSaQyAbpPQ==",
       "dependencies": {
-        "@forge/api": "3.3.1",
+        "@forge/api": "3.4.0-next.0",
         "@forge/runtime": "5.5.0",
         "agentkeepalive": "^4.5.0",
         "uuid": "^9.0.1"
       }
     },
     "node_modules/@forge/node-runtime/node_modules/@forge/api": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.3.1.tgz",
-      "integrity": "sha512-pYtRzE0Baevc6kppLHKzt7zENDMcwWsgJNLlN9WjPUR6K8DKzq96EzS1k2ln3PAqG3QjVMPIB9m8LW3DPXFJJg==",
+      "version": "3.4.0-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/api/-/api-3.4.0-next.0.tgz",
+      "integrity": "sha512-GQ0VmedjuXeKGdI3YEZMGtr7aBb8L2ifO/DYTaY8W6b0lWu1Kl2yKaWahYWUjXWoV8Jyzyhcy+dgNLZHKLLhaQ==",
       "dependencies": {
         "@forge/auth": "0.0.5",
         "@forge/egress": "1.2.13",
@@ -1081,11 +1081,11 @@
       }
     },
     "node_modules/@forge/tunnel": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-4.0.8.tgz",
-      "integrity": "sha512-1RNWZj4UL4TIS9IQAClKB2BiiUeBcw63eqIUfvqF/HGDq6RchkF7MhJi5eez8imk7swpVPO4CFWfBeLsllUppA==",
+      "version": "4.0.9-next.0",
+      "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-4.0.9-next.0.tgz",
+      "integrity": "sha512-hDiTZrYoDCeLLIt04Z8gjphvJSsQMuo81zNxdckvNWB3M9AN79v9H71gfWEGhS/CfFK84bSHURRpr9yWgd4Mug==",
       "dependencies": {
-        "@forge/bundler": "4.15.8",
+        "@forge/bundler": "4.15.9-next.0",
         "@forge/cli-shared": "3.25.2",
         "@forge/csp": "3.2.1",
         "@forge/runtime": "5.5.0",

package/out/autocomplete/autocomplete-config.json

@@ -177,6 +177,12 @@
       "--debug": {
         "requireUserArg": false
       },
+      "--debugStartingPort": {
+        "requireUserArg": true
+      },
+      "--debugFunctionHandlers": {
+        "requireUserArg": true
+      },
       "--help": {
         "requireUserArg": false
       }

package/out/command-line/controller/tunnel-controller.d.ts

@@ -1,6 +1,6 @@
-import { CommandLineUI, ConfigFile, PersonalApiCredentialsValidated } from '@forge/cli-shared';
+import { CommandLineUI, ConfigFile, PersonalApiCredentialsValidated, TunnelCommandOptions, TunnelOptions } from '@forge/cli-shared';
 import { TunnelAnalyticsService } from '../../service/tunnel-analytics-service';
-import { DockerTunnelService, TunnelOptions, TunnelService } from '../../service/tunnel-service';
+import { DockerTunnelService, TunnelService } from '../../service/tunnel-service';
 import { TunnelView } from '../view/tunnel-view';
 export declare class TunnelController {
     private readonly analyticsService;
@@ -10,7 +10,7 @@ export declare class TunnelController {
     private readonly tunnelView;
     private readonly configFile;
     constructor(analyticsService: TunnelAnalyticsService, nodeTunnelService: TunnelService, localTunnelService: TunnelService, dockerTunnelService: DockerTunnelService, tunnelView: TunnelView, configFile: ConfigFile);
-    run(tunnelOptions: TunnelOptions, ui: CommandLineUI): Promise<void>;
+    run(tunnelOptions: TunnelCommandOptions, ui: CommandLineUI): Promise<void>;
     runDockerTunnel(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
 }
 //# sourceMappingURL=tunnel-controller.d.ts.map

package/out/command-line/controller/tunnel-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAGV,+BAA+B,EAEhC,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBALV,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,kBAAkB,EAAE,aAAa,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IAG5B,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnE,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,UAAU,EAGV,+BAA+B,EAC/B,oBAAoB,EAEpB,aAAa,EACd,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAkC,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBALV,gBAAgB,EAAE,sBAAsB,EACxC,iBAAiB,EAAE,aAAa,EAChC,kBAAkB,EAAE,aAAa,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IAG5B,GAAG,CAAC,aAAa,EAAE,oBAAoB,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA2B1E,eAAe,CAC1B,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/command-line/controller/tunnel-controller.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TunnelController = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const docker_service_1 = require("../../service/docker-service");
+const tunnel_service_1 = require("../../service/tunnel-service");
 class TunnelController {
     constructor(analyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile) {
         this.analyticsService = analyticsService;
@@ -13,16 +14,24 @@ class TunnelController {
         this.configFile = configFile;
     }
     async run(tunnelOptions, ui) {
+        const options = Object.assign(Object.assign({}, tunnelOptions), { debugStartingPort: undefined });
+        if (tunnelOptions.debugStartingPort !== undefined) {
+            const port = parseInt(tunnelOptions.debugStartingPort);
+            if (isNaN(port) || port < 0 || port > 65535) {
+                throw new tunnel_service_1.InvalidDebugStartingPortNumber(tunnelOptions.debugStartingPort);
+            }
+            options.debugStartingPort = port;
+        }
         const creds = await (0, cli_shared_1.getCredentialStore)(ui).getCredentials();
         const localTunnelErrorCallback = this.tunnelView.getTunnelErrorHandler(cli_shared_1.exitOnError);
         this.tunnelView.dockerPreamble(tunnelOptions.environment);
         if ((await this.configFile.runtimeType()) === cli_shared_1.RuntimeType.nodejs) {
-            return await this.nodeTunnelService.run(tunnelOptions, creds, ui.debugEnabled);
+            return await this.nodeTunnelService.run(options, creds, ui.debugEnabled);
         }
         if (process.env.FORGE_DEV_TUNNEL) {
-            return await this.localTunnelService.run(tunnelOptions, creds, ui.debugEnabled, localTunnelErrorCallback);
+            return await this.localTunnelService.run(options, creds, ui.debugEnabled, localTunnelErrorCallback);
         }
-        await this.runDockerTunnel(tunnelOptions, creds, ui.debugEnabled);
+        await this.runDockerTunnel(options, creds, ui.debugEnabled);
     }
     async runDockerTunnel(tunnelOptions, creds, debugEnabled) {
         try {

package/out/command-line/register-tunnel-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAU/F,CAAC"}
+{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAY/F,CAAC"}

package/out/command-line/register-tunnel-commands.js

@@ -9,6 +9,8 @@ const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
         .description(cli_shared_1.Text.tunnel.cmd)
         .environmentOption()
         .option('-d, --debug', cli_shared_1.Text.tunnel.optionDebugger)
+        .option('-p,--debugStartingPort [debugStartingPort]', cli_shared_1.Text.tunnel.debuggerPort, '9229')
+        .option('-f,--debugFunctionHandlers [debugFunctionHandlers...]', cli_shared_1.Text.tunnel.functionHandlers)
         .action(async (options) => {
         await tunnelController.run(options, ui);
     });

package/out/service/tunnel-service.d.ts

@@ -1,22 +1,21 @@
 import { spawn } from 'cross-spawn';
-import { PersonalApiCredentials, PersonalApiCredentialsValidated, UI, UserError } from '@forge/cli-shared';
+import { PersonalApiCredentials, PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
 import { StartTunnelCommand, TunnelInteractor } from '@forge/tunnel';
 import { CachedConfigService } from './cached-config-service';
 import { DockerService } from './docker-service';
 import { ConfigFilePortFindingService } from './port-finding-service';
 import { TunnelAnalyticsService } from './tunnel-analytics-service';
-export interface TunnelOptions {
-    debug?: boolean;
-    environment?: string;
-}
 export declare const CONTAINER_NAME: string;
 export declare const IMAGE_NAME: string;
 export declare type TunnelService = {
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
 };
-export declare class DebugNotSupportedError extends UserError {
+export declare class FunctionHandlersMustBeDefinedInDebugMode extends UserError {
     constructor();
 }
+export declare class InvalidDebugStartingPortNumber extends UserError {
+    constructor(port: string);
+}
 declare abstract class TunnelServiceBase implements TunnelService {
     protected readonly cachedConfigService: CachedConfigService;
     constructor(cachedConfigService: CachedConfigService);

package/out/service/tunnel-service.d.ts.map

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

package/out/service/tunnel-service.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DockerTunnelService = exports.LocalTunnelService = exports.InProcessTunnelService = exports.DebugNotSupportedError = exports.IMAGE_NAME = exports.CONTAINER_NAME = void 0;
+exports.DockerTunnelService = exports.LocalTunnelService = exports.InProcessTunnelService = exports.InvalidDebugStartingPortNumber = exports.FunctionHandlersMustBeDefinedInDebugMode = exports.IMAGE_NAME = exports.CONTAINER_NAME = void 0;
 const tslib_1 = require("tslib");
 const cross_spawn_1 = require("cross-spawn");
 const os_1 = tslib_1.__importDefault(require("os"));
@@ -28,12 +28,18 @@ else {
 exports.IMAGE_NAME = process.env.FORGE_DEV_DOCKER_TUNNEL
     ? 'local/forge-tunnel:test'
     : `atlassian/forge-tunnel:${versionTags[0]}`;
-class DebugNotSupportedError extends cli_shared_1.UserError {
+class FunctionHandlersMustBeDefinedInDebugMode extends cli_shared_1.UserError {
     constructor() {
-        super(cli_shared_1.Text.tunnel.inspectorUnsupported);
+        super(cli_shared_1.Text.tunnel.functionHandlersMustBeDefined);
     }
 }
-exports.DebugNotSupportedError = DebugNotSupportedError;
+exports.FunctionHandlersMustBeDefinedInDebugMode = FunctionHandlersMustBeDefinedInDebugMode;
+class InvalidDebugStartingPortNumber extends cli_shared_1.UserError {
+    constructor(port) {
+        super(cli_shared_1.Text.tunnel.invalidDebugStartingPortNumber(port));
+    }
+}
+exports.InvalidDebugStartingPortNumber = InvalidDebugStartingPortNumber;
 class TunnelServiceBase {
     constructor(cachedConfigService) {
         this.cachedConfigService = cachedConfigService;
@@ -57,8 +63,8 @@ class InProcessTunnelService extends TunnelServiceBase {
     }
     async run(tunnelOptions, creds, debugEnabled, onError) {
         try {
-            if (tunnelOptions.debug === true) {
-                throw new DebugNotSupportedError();
+            if (tunnelOptions.debug && !tunnelOptions.debugFunctionHandlers) {
+                throw new FunctionHandlersMustBeDefinedInDebugMode();
             }
             const resourcePortMap = await this.configFilePortFindingService.findPorts();
             const tunnel = await this.startTunnelCommand.execute({
@@ -67,7 +73,7 @@ class InProcessTunnelService extends TunnelServiceBase {
                 host: 'localhost',
                 ngrokConfig: this.ngrokConfigPath()
             });
-            const monitor = await this.tunnelInteractor.watchApp(tunnel);
+            const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
             await this.tunnelInteractor.handleUserExitEvent(tunnel.stopFunction, monitor);
         }
         catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "8.0.1",
+  "version": "8.1.0-next.0",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,14 +18,14 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "4.15.8",
+    "@forge/bundler": "4.15.9-next.0",
     "@forge/cli-shared": "3.25.2",
     "@forge/egress": "1.2.13",
     "@forge/lint": "4.0.10",
     "@forge/manifest": "6.3.1",
-    "@forge/node-runtime": "0.10.0",
+    "@forge/node-runtime": "0.10.1-next.0",
     "@forge/runtime": "5.5.0",
-    "@forge/tunnel": "4.0.8",
+    "@forge/tunnel": "4.0.9-next.0",
     "@forge/util": "1.4.2",
     "@sentry/node": "7.100.1",
     "ajv": "^8.12.0",