@forge/cli 12.0.0-next.15 → 12.0.0-next.9

package/out/deploy/deployer/deployer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArtifactDeployer = exports.ExistingInstallationsError = exports.ManifestValidationFailedError = exports.HostedResourceDeploymentFailedError = exports.AppDeploymentFailedError = void 0;
+exports.ArtifactDeployer = exports.ExistingInstallationsError = exports.ManifestValidationFailedError = exports.HostedResourceDeploymentFailedError = exports.AppSnapshotFailedError = exports.AppDeploymentFailedError = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const DEPLOYMENT_EVENT_POLL_INTERVAL = 500;
 class AppDeploymentFailedError extends cli_shared_1.BaseError {
@@ -14,6 +14,17 @@ class AppDeploymentFailedError extends cli_shared_1.BaseError {
     }
 }
 exports.AppDeploymentFailedError = AppDeploymentFailedError;
+class AppSnapshotFailedError extends cli_shared_1.BaseError {
+    userError;
+    constructor(userError = false, requestId, message) {
+        super(requestId, message);
+        this.userError = userError;
+    }
+    isUserError() {
+        return this.userError;
+    }
+}
+exports.AppSnapshotFailedError = AppSnapshotFailedError;
 class HostedResourceDeploymentFailedError extends cli_shared_1.BaseError {
     userError;
     constructor(userError = false, requestId, message) {
@@ -45,6 +56,12 @@ exports.ExistingInstallationsError = ExistingInstallationsError;
 function isTransitionEvent(event) {
     return event.__typename === 'AppDeploymentTransitionEvent';
 }
+function isSnapshotLogEvent(event) {
+    return event.__typename === 'AppDeploymentSnapshotLogEvent';
+}
+function isValidSnapshotLogEvent(event) {
+    return !!(event.message && event.level);
+}
 class ArtifactDeployer {
     getConfiguredApp;
     deployClient;
@@ -135,6 +152,15 @@ class ArtifactDeployer {
                     this.ui.info(cli_shared_1.Text.deploy.taskDeploy.serverStepStarted(event.stepName));
                 }
             }
+            else if (isSnapshotLogEvent(event)) {
+                if (!addNewLineBetweenTransitions) {
+                    this.ui.emptyLine();
+                    addNewLineBetweenTransitions = true;
+                }
+                if (isValidSnapshotLogEvent(event)) {
+                    this.ui.snapshotLog(event.message, event.level);
+                }
+            }
             else if (event.message) {
                 this.ui.debug(event.message);
             }
@@ -144,6 +170,12 @@ class ArtifactDeployer {
         if (errorDetails) {
             const { code, message } = errorDetails;
             switch (code) {
+                case 'APP_CODE_SNAPSHOT_FAILED': {
+                    throw new AppSnapshotFailedError(true, requestId, cli_shared_1.Text.snapshot.error('App code snapshot error', message));
+                }
+                case 'APP_CODE_SNAPSHOT_TIMEOUT': {
+                    throw new AppSnapshotFailedError(false, requestId, cli_shared_1.Text.snapshot.timeout);
+                }
                 case 'ENVIRONMENT_UPDATE_VALIDATION_FAILED': {
                     const causeMessage = errorDetails?.fields?.validationResult.message.replace(/Upsert.*Error message: /, '');
                     if (causeMessage?.toLowerCase().includes('egress')) {

package/out/deploy/deployer/deployer.js.map

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

package/out/deploy/packager/runtime-bundler.d.ts

@@ -19,4 +19,7 @@ export declare class RuntimeBundler {
     protected packageI18nResources(archiver: Archiver, i18nResourceBundle: I18nResourceBundle): void;
     bundle(handlers: Handler[], i18nResourceBundle: I18nResourceBundle, packageConfig?: App['package']): Promise<RuntimeBundleResult>;
 }
+export declare class NodeRuntimeBundler extends RuntimeBundler {
+    protected packageAll(archiver: Archiver, handlers: Handler[], packageConfig: App['package'], i18nResourceBundle: I18nResourceBundle): Promise<string[]>;
+}
 //# sourceMappingURL=runtime-bundler.d.ts.map

package/out/deploy/packager/runtime-bundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,UAAU,EAAkB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,EAEZ,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EACd,gBAAgB,EAAE,gBAAgB,EACpC,YAAY,EAAE,YAAY;cAG7B,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;cA4BJ,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;IAepB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAMnF,MAAM,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC7B,OAAO,CAAC,mBAAmB,CAAC;CAgBhC"}
+{"version":3,"file":"runtime-bundler.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,UAAU,EAAkB,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,gBAAgB,EAEhB,YAAY,EAEZ,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,MAAM,QAAQ,EAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EACd,gBAAgB,EAAE,gBAAgB,EACpC,YAAY,EAAE,YAAY;cAG7B,WAAW,CACzB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,UAAU,EAAE,EACzB,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;cA4BJ,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cActD,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;IAUpB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAMnF,MAAM,CACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC7B,OAAO,CAAC,mBAAmB,CAAC;CAgBhC;AAED,qBAAa,kBAAmB,SAAQ,cAAc;cACpC,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC;CASrB"}

package/out/deploy/packager/runtime-bundler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuntimeBundler = void 0;
+exports.NodeRuntimeBundler = exports.RuntimeBundler = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const bundler_1 = require("@forge/bundler");
@@ -56,10 +56,6 @@ class RuntimeBundler {
         const entryPoints = (0, bundler_1.getEntryPoints)(handlers);
         const moduleList = await this.packageCode(archiver, entryPoints, i18nResourceBundle);
         await this.packageDependencies(archiver);
-        const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
-        for (const fileName of files) {
-            archiver.addFileFrom(fileName, fileName);
-        }
         return moduleList;
     }
     packageI18nResources(archiver, i18nResourceBundle) {
@@ -79,4 +75,15 @@ class RuntimeBundler {
     }
 }
 exports.RuntimeBundler = RuntimeBundler;
+class NodeRuntimeBundler extends RuntimeBundler {
+    async packageAll(archiver, handlers, packageConfig, i18nResourceBundle) {
+        const moduleList = await super.packageAll(archiver, handlers, packageConfig, i18nResourceBundle);
+        const files = await this.fileSystemReader.getFileGlobList(packageConfig?.extraFiles ?? []);
+        for (const fileName of files) {
+            archiver.addFileFrom(fileName, fileName);
+        }
+        return moduleList;
+    }
+}
+exports.NodeRuntimeBundler = NodeRuntimeBundler;
 //# sourceMappingURL=runtime-bundler.js.map

package/out/deploy/packager/runtime-bundler.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-bundler.js","sourceRoot":"","sources":["../../../src/deploy/packager/runtime-bundler.ts"],"names":[],"mappings":"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"}

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

@@ -11,8 +11,12 @@ export declare enum DockerErrorCode {
 }
 export declare class DockerService {
     verifyInstalled(): void;
+    runContainer(args: string[]): ReturnType<typeof spawn>;
     authenticateDocker(args: string[]): ReturnType<typeof spawn>;
     getDockerVersion(debugEnabled: boolean): Promise<string>;
+    removeContainer(containerName: string): Promise<void>;
+    downloadImage(imageName: string): ReturnType<typeof spawn>;
+    startCleanupWorker(pids: number[], containerName: string): void;
     private execPromise;
 }
 //# sourceMappingURL=docker-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAQpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAOtD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBrE,OAAO,CAAC,WAAW;CAWpB"}
+{"version":3,"file":"docker-service.d.ts","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAQ,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAUpD,qBAAa,WAAY,SAAQ,SAAS;aAGtB,IAAI,EAAE,eAAe;gBADrC,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,eAAe;CAIxC;AAED,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAE1E,oBAAY,eAAe;IACzB,kBAAkB,IAAA;IAClB,aAAa,IAAA;CACd;AAED,qBAAa,aAAa;IACjB,eAAe,IAAI,IAAI;IAMvB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAKtD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAOtD,gBAAgB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAexD,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC;IAW1D,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IActE,OAAO,CAAC,WAAW;CAWpB"}

package/out/service/docker-service.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerService = exports.DockerErrorCode = exports.DOCKER_DOWNLOAD_LINK = exports.DockerError = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
+const path_1 = tslib_1.__importDefault(require("path"));
 const command_exists_1 = tslib_1.__importDefault(require("command-exists"));
 const cross_spawn_1 = require("cross-spawn");
 const cli_shared_1 = require("@forge/cli-shared");
@@ -26,6 +27,10 @@ class DockerService {
             throw new DockerError(cli_shared_1.Text.tunnel.error.dockerNotInstalled(exports.DOCKER_DOWNLOAD_LINK), DockerErrorCode.NOT_INSTALLED);
         }
     }
+    runContainer(args) {
+        this.verifyInstalled();
+        return (0, cross_spawn_1.spawn)('docker', ['run', ...args], { stdio: ['inherit', 'inherit', 'pipe'] });
+    }
     authenticateDocker(args) {
         this.verifyInstalled();
         return (0, cross_spawn_1.spawn)('docker', ['login', ...args], {
@@ -41,6 +46,27 @@ class DockerService {
         const dockerVersion = stdout.trim();
         return dockerVersion;
     }
+    async removeContainer(containerName) {
+        this.verifyInstalled();
+        await this.execPromise(`docker rm -f ${containerName}`);
+    }
+    downloadImage(imageName) {
+        this.verifyInstalled();
+        return (0, cross_spawn_1.spawn)('docker', ['pull', imageName], {
+            env: {
+                ...process.env,
+                DOCKER_CLI_HINTS: '0'
+            }
+        });
+    }
+    startCleanupWorker(pids, containerName) {
+        const dockerCleanUp = (0, cross_spawn_1.spawn)(process.env.NODE_ENV === 'development' ? 'ts-node' : 'node', [path_1.default.join(__dirname, '../workers/tunnel-cleanup-worker')], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
+        const message = {
+            pids,
+            containers: [containerName]
+        };
+        dockerCleanUp.send(message);
+    }
     execPromise(cmd) {
         return new Promise((resolve) => {
             (0, child_process_1.exec)(cmd, (err, stdout, stderr) => {

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

@@ -1 +1 @@
-{"version":3,"file":"docker-service.js","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":";;;;AAAA,iDAAoD;AAEpD,4EAA2C;AAC3C,6CAAoC;AAEpC,kDAAoD;AAQpD,MAAa,WAAY,SAAQ,sBAAS;IAGtB;IAFlB,YACE,OAAe,EACC,IAAqB;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,SAAI,GAAJ,IAAI,CAAiB;IAGvC,CAAC;CACF;AAPD,kCAOC;AAEY,QAAA,oBAAoB,GAAG,qCAAqC,CAAC;AAE1E,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,iFAAkB,CAAA;IAClB,uEAAa,CAAA;AACf,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AAED,MAAa,aAAa;IACjB,eAAe;QACpB,IAAI,CAAC,wBAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,MAAM,IAAI,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,4BAAoB,CAAC,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;SAClH;IACH,CAAC;IAEM,kBAAkB,CAAC,IAAc;QACtC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,IAAA,mBAAK,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;YACzC,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;SACtC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,YAAqB;QACjD,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,+CAA+C,CAAC,CAAC;QAEhG,IAAI,GAAG,EAAE;YACP,MAAM,IAAI,WAAW,CACnB,iBAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,EACnE,eAAe,CAAC,kBAAkB,CACnC,CAAC;SACH;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAEpC,OAAO,aAAa,CAAC;IACvB,CAAC;IAGO,WAAW,CAAC,GAAW;QAC7B,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,EAAE;YAChD,IAAA,oBAAI,EAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAChC,OAAO,CAAC;oBACN,GAAG,EAAE,GAAG;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAzCD,sCAyCC"}
+{"version":3,"file":"docker-service.js","sourceRoot":"","sources":["../../src/service/docker-service.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,15 @@
 import { PersonalApiCredentialsValidated, CLIDetails } from '@forge/cli-shared';
 import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
+import { DownloadProgressCallbacks } from '../command-line/view/tunnel-view';
 export declare class TunnelAnalyticsService {
     private readonly analyticsClientReporter;
     private readonly cliDetails;
     constructor(analyticsClientReporter: AnalyticsClientReporter, cliDetails: CLIDetails | undefined);
+    reportDockerVersion(creds: PersonalApiCredentialsValidated, dockerVersion: string | null): void;
+    reportTunnelClosed(creds: PersonalApiCredentialsValidated): void;
     reportTunnelFailure(creds: PersonalApiCredentialsValidated, errorName: string, attributes: {
         [key: string]: any;
     }): Promise<void>;
+    getImageDownloadReporters(creds: PersonalApiCredentialsValidated): DownloadProgressCallbacks;
 }
 //# sourceMappingURL=tunnel-analytics-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;CAgBrC"}
+{"version":3,"file":"tunnel-analytics-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,uBAAuB,EAAE,uBAAuB,EAChD,UAAU,EAAE,UAAU,GAAG,SAAS;IAG9C,mBAAmB,CAAC,KAAK,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAM/F,kBAAkB,CAAC,KAAK,EAAE,+BAA+B,GAAG,IAAI;IAI1D,mBAAmB,CAC9B,KAAK,EAAE,+BAA+B,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAiB7B,yBAAyB,CAAC,KAAK,EAAE,+BAA+B,GAAG,yBAAyB;CAOpG"}

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

@@ -9,6 +9,14 @@ class TunnelAnalyticsService {
         this.analyticsClientReporter = analyticsClientReporter;
         this.cliDetails = cliDetails;
     }
+    reportDockerVersion(creds, dockerVersion) {
+        this.analyticsClientReporter.reportSuccess('docker version check', creds, {
+            dockerVersion
+        });
+    }
+    reportTunnelClosed(creds) {
+        this.analyticsClientReporter.reportSuccess('close tunnel', creds, {});
+    }
     async reportTunnelFailure(creds, errorName, attributes) {
         attributes = {
             error: errorName,
@@ -23,6 +31,13 @@ class TunnelAnalyticsService {
         }
         this.analyticsClientReporter.reportInvokeFailure('tunnel', creds, attributes);
     }
+    getImageDownloadReporters(creds) {
+        return {
+            onStart: () => this.analyticsClientReporter.reportSuccess('image download started', creds, {}),
+            onFailure: () => this.analyticsClientReporter.reportSuccess('image download failed', creds, {}),
+            onSuccess: () => this.analyticsClientReporter.reportSuccess('image download finished', creds, {})
+        };
+    }
 }
 exports.TunnelAnalyticsService = TunnelAnalyticsService;
 //# sourceMappingURL=tunnel-analytics-service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AAGpG,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,KAAK,CAAC,mBAAmB,CAC9B,KAAsC,EACtC,SAAiB,EACjB,UAAkC;QAElC,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;CACF;AAzBD,wDAyBC"}
+{"version":3,"file":"tunnel-analytics-service.js","sourceRoot":"","sources":["../../src/service/tunnel-analytics-service.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AAIpG,MAAa,sBAAsB;IAEd;IACA;IAFnB,YACmB,uBAAgD,EAChD,UAAkC;QADlC,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,eAAU,GAAV,UAAU,CAAwB;IAClD,CAAC;IAEG,mBAAmB,CAAC,KAAsC,EAAE,aAA4B;QAC7F,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,sBAAsB,EAAE,KAAK,EAAE;YACxE,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAEM,kBAAkB,CAAC,KAAsC;QAC9D,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,KAAsC,EACtC,SAAiB,EACjB,UAAkC;QAElC,UAAU,GAAG;YACX,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO;YACjC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM;YAC/B,QAAQ,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,UAAU,CAAC;YAC7C,kBAAkB,EAAE,IAAI;YACxB,GAAG,UAAU;SACd,CAAC;QACF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE;YACxC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;SACpD;QAED,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAChF,CAAC;IAEM,yBAAyB,CAAC,KAAsC;QACrE,OAAO;YACL,OAAO,EAAE,GAAS,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,wBAAwB,EAAE,KAAK,EAAE,EAAE,CAAC;YACpG,SAAS,EAAE,GAAS,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,uBAAuB,EAAE,KAAK,EAAE,EAAE,CAAC;YACrG,SAAS,EAAE,GAAS,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,yBAAyB,EAAE,KAAK,EAAE,EAAE,CAAC;SACxG,CAAC;IACJ,CAAC;CACF;AA3CD,wDA2CC"}

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

@@ -1,8 +1,12 @@
-import { PersonalApiCredentialsValidated, TunnelOptions, UI, UserError } from '@forge/cli-shared';
+import { spawn } from 'cross-spawn';
+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 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>;
 };
@@ -29,5 +33,36 @@ export declare class InProcessTunnelService extends TunnelServiceBase {
     constructor(ui: UI, startTunnelCommand: StartTunnelCommand, tunnelInteractor: TunnelInteractor, configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, analyticsService: TunnelAnalyticsService);
     run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
 }
+interface EnvironmentVariable {
+    key: string;
+    value: string;
+}
+declare abstract class SandboxTunnelServiceBase extends TunnelServiceBase {
+    protected readonly configFilePortFindingService: ConfigFilePortFindingService;
+    protected readonly cachedConfigService: CachedConfigService;
+    constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService);
+    getTunnelProcessEnvironment(tunnelOptions: TunnelOptions, debugEnabled: boolean, { email, token }: PersonalApiCredentials, port: number, cspReporterPort: number | undefined, resourcePorts: Record<string, number>): Promise<EnvironmentVariable[]>;
+    private getInspectorPortEnvironment;
+    private getCspReporterPortEnvironment;
+    private getResourcePortEnvironment;
+    private getUserEnvironmentVariables;
+}
+export declare class LocalTunnelService extends SandboxTunnelServiceBase {
+    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean, onError?: (err: Error) => Promise<void>): Promise<void>;
+    private formatEnvForLocalTunnel;
+}
+export declare class DockerTunnelService extends SandboxTunnelServiceBase {
+    private readonly dockerService;
+    private readonly analyticsService;
+    constructor(configFilePortFindingService: ConfigFilePortFindingService, cachedConfigService: CachedConfigService, dockerService: DockerService, analyticsService: TunnelAnalyticsService);
+    run(tunnelOptions: TunnelOptions, creds: PersonalApiCredentialsValidated, debugEnabled: boolean): Promise<void>;
+    bootstrapDocker(): Promise<ReturnType<typeof spawn> | undefined>;
+    private validateDockerVersion;
+    private getDockerPortOptions;
+    private formatEnvForDocker;
+    private getInteractiveOptions;
+    private getVolumeOptions;
+    private getCommonOptions;
+}
 export {};
 //# sourceMappingURL=tunnel-service.d.ts.map

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":"AAEA,OAAO,EAGL,+BAA+B,EAE/B,aAAa,EACb,EAAE,EACF,SAAS,EACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CACD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,uBAAe,iBAAkB,YAAW,aAAa;IAC3C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;gBAAxC,mBAAmB,EAAE,mBAAmB;aAEvD,GAAG,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CACjB;AAaD,qBAAa,sBAAuB,SAAQ,iBAAiB;IAEzD,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAE7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBALhB,EAAE,EAAE,EAAE,EACN,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B,EAC3E,mBAAmB,EAAE,mBAAmB,EACvB,gBAAgB,EAAE,sBAAsB;IAK9C,GAAG,CACd,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,+BAA+B,EACtC,YAAY,EAAE,OAAO,EACrB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;CAsBjB"}
+{"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,8 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InProcessTunnelService = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
+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");
 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);
@@ -65,4 +90,177 @@ 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);
+            }
+        });
+        if (docker.pid) {
+            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":";;;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"}
+{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1 @@
+{"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"}