@forge/cli 12.0.0-next.7 → 12.0.0

package/out/service/tunnel-service.js

@@ -1,33 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DockerTunnelService = exports.LocalTunnelService = exports.InProcessTunnelService = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = 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"));
-const path_1 = require("path");
-const portfinder_1 = require("portfinder");
-const semver_1 = require("semver");
+exports.InProcessTunnelService = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
 const manifest_1 = require("@forge/manifest");
 const cli_shared_1 = require("@forge/cli-shared");
-const version_info_1 = require("../command-line/version-info");
-const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
-exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
-const cliDetails = (0, version_info_1.getCLIDetails)();
-let versionTags;
-if (cliDetails?.version !== undefined) {
-    if (process.env.FORGE_IN_LOCAL_E2E === 'true') {
-        versionTags = ['e2e'];
-    }
-    else {
-        versionTags = (0, semver_1.prerelease)(cliDetails.version) || ['latest'];
-    }
-}
-else {
-    versionTags = ['latest'];
-}
-exports.IMAGE_NAME = process.env.FORGE_DEV_DOCKER_TUNNEL
-    ? 'local/forge-tunnel:test'
-    : `atlassian/forge-tunnel:${versionTags[0]}`;
 class FunctionHandlersMustBeDefinedInDebugMode extends cli_shared_1.UserError {
     constructor() {
         super(cli_shared_1.Text.tunnel.functionHandlersMustBeDefined);
@@ -90,175 +65,4 @@ class InProcessTunnelService extends TunnelServiceBase {
     }
 }
 exports.InProcessTunnelService = InProcessTunnelService;
-class SandboxTunnelServiceBase extends TunnelServiceBase {
-    configFilePortFindingService;
-    cachedConfigService;
-    constructor(configFilePortFindingService, cachedConfigService) {
-        super(cachedConfigService);
-        this.configFilePortFindingService = configFilePortFindingService;
-        this.cachedConfigService = cachedConfigService;
-    }
-    async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
-        const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
-        return [
-            { key: 'APP_FOLDER', value: '/app' },
-            { key: 'FORGE_EMAIL', value: email },
-            { key: 'FORGE_API_TOKEN', value: token },
-            { key: 'ENVIRONMENT_KEY', value: tunnelOptions.environment ?? 'default' },
-            { key: 'TUNNEL_INSPECTOR_ENABLED', value: (!!tunnelOptions.debug).toString() },
-            { key: 'FORGE_GRAPHQL_GATEWAY', value: graphqlGateway },
-            { key: 'VERBOSE_MODE', value: `${debugEnabled}` },
-            { key: 'CLI_DETAILS', value: JSON.stringify(cliDetails) },
-            ...this.getInspectorPortEnvironment(port),
-            ...this.getCspReporterPortEnvironment(cspReporterPort),
-            ...this.getResourcePortEnvironment(resourcePorts),
-            ...this.getUserEnvironmentVariables()
-        ];
-    }
-    getInspectorPortEnvironment(port) {
-        return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
-    }
-    getCspReporterPortEnvironment(cspReporterPort) {
-        if (cspReporterPort) {
-            return [{ key: 'CSP_REPORTER_PORT', value: cspReporterPort.toString() }];
-        }
-        return [];
-    }
-    getResourcePortEnvironment(resourcePorts) {
-        return [{ key: `RESOURCE_PORT_MAP`, value: JSON.stringify(resourcePorts) }];
-    }
-    getUserEnvironmentVariables() {
-        const vars = [];
-        Object.keys(process.env)
-            .filter((variable) => variable.startsWith('FORGE_USER_VAR_'))
-            .forEach((name) => {
-            vars.push({ key: name, value: process.env[name] ?? 'undefined' });
-        });
-        return vars;
-    }
-}
-class LocalTunnelService extends SandboxTunnelServiceBase {
-    async run(tunnelOptions, creds, debugEnabled, onError) {
-        const port = await (0, portfinder_1.getPortPromise)();
-        const resourcePorts = await this.configFilePortFindingService.findPorts();
-        const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
-        const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
-        const env = this.formatEnvForLocalTunnel(environment);
-        const process = (0, cross_spawn_1.spawn)('forge-tunnel', [], {
-            stdio: 'inherit',
-            env: {
-                ...env,
-                FORGE_DEV_TUNNEL: 'true'
-            }
-        });
-        if (onError) {
-            process.on('error', onError);
-        }
-    }
-    formatEnvForLocalTunnel(environment) {
-        return Object.assign({}, {
-            PATH: process.env.PATH || '',
-            FORCE_COLOR: '1'
-        }, ...environment.map(({ key, value }) => ({ [key]: value })));
-    }
-}
-exports.LocalTunnelService = LocalTunnelService;
-class DockerTunnelService extends SandboxTunnelServiceBase {
-    dockerService;
-    analyticsService;
-    constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService) {
-        super(configFilePortFindingService, cachedConfigService);
-        this.dockerService = dockerService;
-        this.analyticsService = analyticsService;
-    }
-    async run(tunnelOptions, creds, debugEnabled) {
-        await this.validateDockerVersion(creds, debugEnabled);
-        const startPort = 8000 + Math.round(Math.random() * 100);
-        const port = await (0, portfinder_1.getPortPromise)({ port: startPort });
-        const dockerOptions = await this.getCommonOptions();
-        const resourcePorts = await this.configFilePortFindingService.findPorts(port);
-        const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
-        const environment = await this.getTunnelProcessEnvironment(tunnelOptions, debugEnabled, creds, port, cspReporterPort, resourcePorts);
-        const portOptions = this.getDockerPortOptions(port, resourcePorts, cspReporterPort);
-        const interactiveOptions = this.getInteractiveOptions();
-        const volumeOptions = await this.getVolumeOptions();
-        const env = this.formatEnvForDocker(environment);
-        const docker = this.dockerService.runContainer([
-            ...interactiveOptions,
-            ...volumeOptions,
-            ...portOptions,
-            ...dockerOptions,
-            ...env,
-            exports.IMAGE_NAME
-        ]);
-        docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));
-        docker.stderr?.on('data', async (error) => {
-            const errorMessage = error;
-            let errorJson;
-            try {
-                errorJson = JSON.parse(errorMessage);
-            }
-            catch (e) {
-            }
-            if (errorJson && errorJson.__tunnel_error__) {
-                const tunnelErrorDetails = errorJson;
-                await this.analyticsService.reportTunnelFailure(creds, tunnelErrorDetails.name, tunnelErrorDetails.attributes);
-            }
-            else {
-                process.stderr?.write(errorMessage);
-            }
-        });
-        this.dockerService.startCleanupWorker([docker.pid], exports.CONTAINER_NAME);
-    }
-    async bootstrapDocker() {
-        await this.dockerService.removeContainer(exports.CONTAINER_NAME);
-        if (!process.env.FORGE_DEV_DOCKER_TUNNEL) {
-            return this.dockerService.downloadImage(exports.IMAGE_NAME);
-        }
-    }
-    async validateDockerVersion(creds, debugEnabled) {
-        const version = await this.dockerService.getDockerVersion(debugEnabled);
-        this.analyticsService.reportDockerVersion(creds, version);
-    }
-    getDockerPortOptions(port, resourcePorts, cspReporterPort) {
-        const resourcePortOptions = (0, cli_shared_1.flatMap)(Object.values(resourcePorts), (resourcePort) => [
-            '-p',
-            `${resourcePort}:${resourcePort}`
-        ]);
-        const cspReporterPortOption = [];
-        if (cspReporterPort) {
-            cspReporterPortOption.push('-p', `${cspReporterPort}:${cspReporterPort}`);
-        }
-        const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
-        return [`-p`, `${port}:${port}`, ...resourcePortOptions, ...addHostOption, ...cspReporterPortOption];
-    }
-    formatEnvForDocker(environment) {
-        return (0, cli_shared_1.flatMap)(environment, ({ key, value }) => ['--env', `${key}=${value}`]);
-    }
-    getInteractiveOptions() {
-        if (DISABLE_TTY) {
-            return [`-i`];
-        }
-        return [`-it`];
-    }
-    async getVolumeOptions() {
-        const options = [`-v=${process.cwd()}:/app:cached`];
-        if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
-            const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
-            options.push(`-v=${monorepoRoot}:/monorepo:cached`);
-            options.push(`-v=${monorepoRoot}/node_modules/cloudflared/docker-bin:/monorepo/node_modules/cloudflared/bin`);
-        }
-        if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
-            const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');
-            mounts.forEach((mount) => {
-                options.push(`-v=${mount}:cached`);
-            });
-        }
-        return options;
-    }
-    async getCommonOptions() {
-        return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
-    }
-}
-exports.DockerTunnelService = DockerTunnelService;
 //# sourceMappingURL=tunnel-service.js.map

package/out/service/tunnel-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAQ2B;AAgB3B,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAe,iBAAiB;IACC;IAA/B,YAA+B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;CAQ5E;AAaD,MAAa,sBAAuB,SAAQ,iBAAiB;IAExC;IACA;IACA;IACA;IAEA;IANnB,YACmB,EAAM,EACN,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D,EAC3E,mBAAwC,EACvB,gBAAwC;QAEzD,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAPV,OAAE,GAAF,EAAE,CAAI;QACN,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAE1D,qBAAgB,GAAhB,gBAAgB,CAAwB;IAG3D,CAAC;IAEM,KAAK,CAAC,GAAG,CACd,aAA4B,EAC5B,KAAsC,EACtC,YAAqB,EACrB,OAAuC;QAEvC,IAAI;YACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;YAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACnD,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;gBACrF,eAAe;gBACf,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;YAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;YAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,OAAO,EAAE;gBACX,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;aAClB;iBAAM;gBACL,MAAM,IAAA,wBAAW,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAC/B;SACF;IACH,CAAC;CACF;AAvCD,wDAuCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "12.0.0-next.7",
+  "version": "12.0.0",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -18,13 +18,13 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "5.0.1-next.7",
-    "@forge/cli-shared": "7.1.0-next.7",
-    "@forge/egress": "1.4.1",
-    "@forge/lint": "5.9.0-next.7",
-    "@forge/manifest": "9.5.0-next.6",
-    "@forge/runtime": "5.10.8",
-    "@forge/tunnel": "5.11.1-next.7",
+    "@forge/bundler": "6.0.0",
+    "@forge/cli-shared": "8.0.0",
+    "@forge/egress": "2.0.0",
+    "@forge/lint": "5.9.0",
+    "@forge/manifest": "10.0.0",
+    "@forge/runtime": "6.0.0",
+    "@forge/tunnel": "6.0.0",
     "@forge/util": "1.4.9",
     "@sentry/node": "7.106.0",
     "@forge/i18n": "0.0.6",
@@ -70,13 +70,14 @@
     "@types/hidefile": "^3.0.3",
     "@types/inquirer": "^8.2.10",
     "@types/jest": "^29.5.12",
-    "@types/node": "14.18.63",
+    "@types/node": "20.19.0",
     "@types/node-fetch": "^2.6.11",
     "@types/omelette": "^0.4.4",
     "@types/semver": "^7.5.8",
     "@types/tmp": "^0.2.6",
     "@types/uuid": "^9.0.8",
     "@types/jws": "^3.2.10",
+    "chokidar": "^3.6.0",
     "jws": "^4.0.0",
     "jest": "^29.7.0",
     "jest-fixtures": "^0.6.0",
@@ -87,7 +88,7 @@
     "type-fest": "4.10.2"
   },
   "engines": {
-    "node": ">=18.20.7"
+    "node": ">=20.0.0"
   },
   "publishConfig": {
     "registry": "https://packages.atlassian.com/api/npm/npm-public/"

package/out/workers/tunnel-clean-up-worker.d.ts

@@ -1,8 +0,0 @@
-export declare type TunnelCleanUpMessage = {
-    pids: number[];
-    containers: string[];
-};
-export declare class TunnelCleanUpWorker {
-    doWork(): void;
-}
-//# sourceMappingURL=tunnel-clean-up-worker.d.ts.map

package/out/workers/tunnel-clean-up-worker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tunnel-clean-up-worker.d.ts","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":"AAGA,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,qBAAa,mBAAmB;IACvB,MAAM,IAAI,IAAI;CAwBtB"}

package/out/workers/tunnel-clean-up-worker.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TunnelCleanUpWorker = void 0;
-const os_1 = require("os");
-const cross_spawn_1 = require("cross-spawn");
-class TunnelCleanUpWorker {
-    doWork() {
-        let pids;
-        let containers;
-        const messageHandler = ({ pids: passedPids, containers: passedContainers }) => {
-            pids = passedPids;
-            containers = passedContainers;
-        };
-        const disconnectHandler = ({ pids, containers }) => {
-            pids.forEach((pid) => {
-                process.kill(pid, os_1.constants.signals.SIGINT);
-            });
-            (0, cross_spawn_1.spawn)('docker', ['rm', '-f', ...containers]);
-            process.exit(0);
-        };
-        process.on('message', messageHandler);
-        process.on('disconnect', () => {
-            disconnectHandler({ pids, containers });
-        });
-    }
-}
-exports.TunnelCleanUpWorker = TunnelCleanUpWorker;
-if (require.main === module) {
-    const worker = new TunnelCleanUpWorker();
-    worker.doWork();
-}
-//# sourceMappingURL=tunnel-clean-up-worker.js.map

package/out/workers/tunnel-clean-up-worker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tunnel-clean-up-worker.js","sourceRoot":"","sources":["../../src/workers/tunnel-clean-up-worker.ts"],"names":[],"mappings":";;;AAAA,2BAA+B;AAC/B,6CAAoC;AAOpC,MAAa,mBAAmB;IACvB,MAAM;QAEX,IAAI,IAAc,CAAC;QACnB,IAAI,UAAoB,CAAC;QAEzB,MAAM,cAAc,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAwB,EAAQ,EAAE;YACxG,IAAI,GAAG,UAAU,CAAC;YAClB,UAAU,GAAG,gBAAgB,CAAC;QAChC,CAAC,CAAC;QAEF,MAAM,iBAAiB,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAAwB,EAAQ,EAAE;YAC7E,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,cAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACtC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAC5B,iBAAiB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzBD,kDAyBC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAE3B,MAAM,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;IACzC,MAAM,CAAC,MAAM,EAAE,CAAC;CACjB"}