@forge/cli 0.0.0-experimental-e8bfa83 → 0.0.0-experimental-c3effe3

package/out/service/tunnel-service.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerTunnelService = exports.LocalTunnelService = exports.TunnelService = exports.HiddenDockerTunnelError = exports.IMAGE_NAME = exports.CONTAINER_NAME = void 0;
+const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
 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");
@@ -30,10 +32,13 @@ class HiddenDockerTunnelError extends cli_shared_1.HiddenError {
 }
 exports.HiddenDockerTunnelError = HiddenDockerTunnelError;
 class TunnelService {
+    constructor(configFilePortFindingService) {
+        this.configFilePortFindingService = configFilePortFindingService;
+    }
     async getDockerOptions(tunnelOptions, debugEnabled, { email, token }) {
         try {
             const graphqlGateway = cli_shared_1.getGraphqlGateway();
-            const dockerOptions = [
+            return [
                 '--rm',
                 `--name`,
                 exports.CONTAINER_NAME,
@@ -51,16 +56,36 @@ class TunnelService {
                 `FORGE_GRAPHQL_GATEWAY=${graphqlGateway}`,
                 `--env`,
                 `VERBOSE_MODE=${debugEnabled}`,
+                `--env`,
+                `CLI_DETAILS=${JSON.stringify(cliDetails)}`,
                 `${exports.IMAGE_NAME}`
             ];
-            return dockerOptions;
         }
         catch (e) {
             throw new HiddenDockerTunnelError("Couldn't populate docker options for tunneling");
         }
     }
-    getPortOptions(port) {
-        return [`-p`, `${port}:${port}`, `--env`, `TUNNEL_INSPECTOR_PORT=${port}`];
+    getPortOptions(port, resourcePorts, cspReporterPort) {
+        const resourcePortOptions = cli_shared_1.flatMap(Object.values(resourcePorts), (resourcePort) => [
+            '-p',
+            `${resourcePort}:${resourcePort}`
+        ]);
+        const cspReporterPortOption = cspReporterPort
+            ? ['-p', `${cspReporterPort}:${cspReporterPort}`, '--env', `CSP_REPORTER_PORT=${cspReporterPort}`]
+            : [];
+        const addHostOption = os_1.default.platform() === 'linux' ? ['--add-host', 'host.docker.internal:host-gateway'] : [];
+        return [
+            `-p`,
+            `${port}:${port}`,
+            ...resourcePortOptions,
+            ...addHostOption,
+            ...cspReporterPortOption,
+            `--env`,
+            `TUNNEL_INSPECTOR_PORT=${port}`
+        ];
+    }
+    getResourcePortEnvVarOption(resourcePorts) {
+        return ['--env', `RESOURCE_PORT_MAP=${JSON.stringify(resourcePorts)}`];
     }
     getUserEnvironmentVariablesOptions() {
         const options = [];
@@ -75,11 +100,12 @@ class TunnelService {
         return Object.assign(Object.assign({}, env), { PATH: process.env.PATH || '', FORCE_COLOR: '1' });
     }
     transformDockerOptionsToEnvVars(options) {
-        const envVarRegex = new RegExp('^\\w+=.+$', 'g');
+        const envVarRegex = new RegExp('^(\\w+)=(.+)$', 'g');
         const envVars = options.filter((opt) => envVarRegex.test(opt));
         const envVarObj = {};
         envVars.forEach((envVar) => {
-            const [key, val] = envVar.split('=');
+            envVarRegex.lastIndex = 0;
+            const [, key, val] = envVarRegex.exec(envVar);
             envVarObj[key] = val;
         });
         return envVarObj;
@@ -103,16 +129,27 @@ class LocalTunnelService extends TunnelService {
     async run(tunnelOptions, creds, debugEnabled, onError) {
         const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
         const port = await portfinder_1.getPortPromise();
-        const portOptions = this.getPortOptions(port);
+        const resourcePorts = await this.configFilePortFindingService.findPorts();
+        const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
+        const portOptions = this.getPortOptions(port, resourcePorts, cspReporterPort);
         const envVariablesOptions = this.getUserEnvironmentVariablesOptions();
-        const env = this.addEnvVarsForLocalTunnel(this.transformDockerOptionsToEnvVars([...dockerOptions, ...portOptions, ...envVariablesOptions]));
-        cross_spawn_1.spawn('forge-tunnel', [], { stdio: 'inherit', env }).on('error', onError);
+        const resourcePortEnvVarOption = this.getResourcePortEnvVarOption(resourcePorts);
+        const env = this.addEnvVarsForLocalTunnel(this.transformDockerOptionsToEnvVars([
+            ...dockerOptions,
+            ...portOptions,
+            ...envVariablesOptions,
+            ...resourcePortEnvVarOption
+        ]));
+        cross_spawn_1.spawn('forge-tunnel', [], {
+            stdio: 'inherit',
+            env: Object.assign(Object.assign({}, env), { FORGE_DEV_TUNNEL: 'true' })
+        }).on('error', onError);
     }
 }
 exports.LocalTunnelService = LocalTunnelService;
 class DockerTunnelService extends TunnelService {
-    constructor(dockerService, analyticsService) {
-        super();
+    constructor(configFilePortFindingService, dockerService, analyticsService) {
+        super(configFilePortFindingService);
         this.dockerService = dockerService;
         this.analyticsService = analyticsService;
     }
@@ -120,15 +157,19 @@ class DockerTunnelService extends TunnelService {
         await this.validateDockerVersion(creds, debugEnabled);
         const dockerOptions = await this.getDockerOptions(tunnelOptions, debugEnabled, creds);
         const port = await portfinder_1.getPortPromise();
-        const portOptions = this.getPortOptions(port);
+        const resourcePorts = await this.configFilePortFindingService.findPorts(port);
+        const cspReporterPort = await this.configFilePortFindingService.findPortAfter(Object.values(resourcePorts));
+        const portOptions = this.getPortOptions(port, resourcePorts, cspReporterPort);
         const interactiveOptions = this.getInteractiveOptions();
         const volumeOptions = this.getVolumeOptions();
         const envVariablesOptions = this.getUserEnvironmentVariablesOptions();
+        const resourcePortEnvVarOption = this.getResourcePortEnvVarOption(resourcePorts);
         const docker = this.dockerService.runContainer([
             ...interactiveOptions,
             ...volumeOptions,
             ...portOptions,
             ...envVariablesOptions,
+            ...resourcePortEnvVarOption,
             ...dockerOptions
         ]);
         docker.on('exit', () => this.analyticsService.reportTunnelClosed(creds));

package/out/webtrigger/get-webtrigger-url.d.ts

@@ -1,12 +1,18 @@
 import { AppConfigProvider } from '@forge/cli-shared';
-import { GlobalEdgeClient } from '@forge/cli-shared';
 import { AppEnvironmentClient } from '@forge/cli-shared';
 import { Installation } from '../service/installation-service';
+import { WebTriggerGraphQLClient } from './graphql-client';
 export interface Context {
     contextId: string;
     environmentARI: string;
     extensionKey: string;
 }
+export interface WebTriggerUrlDetails {
+    appId: string;
+    contextId: string;
+    environmentId: string;
+    triggerKey: string;
+}
 export interface WebTriggerClient {
     getInstallation(appId: string, installationId: string): Promise<Installation>;
 }
@@ -14,8 +20,8 @@ export declare class GetWebTriggerURLCommand {
     private readonly getAppConfig;
     private readonly webTriggerClient;
     private readonly appEnvironmentClient;
-    private readonly globalEdgeClient;
-    constructor(getAppConfig: AppConfigProvider, webTriggerClient: WebTriggerClient, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient);
-    execute(installationId: string, functionKey: string, isProduction: boolean): Promise<string>;
+    private readonly webTriggerGraphqlClient;
+    constructor(getAppConfig: AppConfigProvider, webTriggerClient: WebTriggerClient, appEnvironmentClient: AppEnvironmentClient, webTriggerGraphqlClient: WebTriggerGraphQLClient);
+    execute(installationId: string, functionKey: string): Promise<string>;
 }
 //# sourceMappingURL=get-webtrigger-url.d.ts.map

package/out/webtrigger/get-webtrigger-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-webtrigger-url.d.ts","sourceRoot":"","sources":["../../src/webtrigger/get-webtrigger-url.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AAQD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAHhB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB;IAGxC,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAkB1G"}
+{"version":3,"file":"get-webtrigger-url.d.ts","sourceRoot":"","sources":["../../src/webtrigger/get-webtrigger-url.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,OAAO;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC/E;AACD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;gBAHvB,YAAY,EAAE,iBAAiB,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,oBAAoB,EAC1C,uBAAuB,EAAE,uBAAuB;IAGtD,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAgBnF"}

package/out/webtrigger/get-webtrigger-url.js

@@ -2,32 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetWebTriggerURLCommand = void 0;
 const cs_ari_1 = require("@forge/util/packages/cs-ari");
-const url_1 = require("url");
-const cli_shared_1 = require("@forge/cli-shared");
-function buildWebtriggerURL(appId, context, extension, isProduction) {
-    const hostname = isProduction ? `${appId}.hello.atlassian-dev.net` : `${appId}.xen.atlassian-dev.net`;
-    const urlObj = new url_1.URL(`/x0/${cli_shared_1.encodeContext(context, extension)}`, `https://${hostname}`);
-    return urlObj.toString();
-}
 class GetWebTriggerURLCommand {
-    constructor(getAppConfig, webTriggerClient, appEnvironmentClient, globalEdgeClient) {
+    constructor(getAppConfig, webTriggerClient, appEnvironmentClient, webTriggerGraphqlClient) {
         this.getAppConfig = getAppConfig;
         this.webTriggerClient = webTriggerClient;
         this.appEnvironmentClient = appEnvironmentClient;
-        this.globalEdgeClient = globalEdgeClient;
+        this.webTriggerGraphqlClient = webTriggerGraphqlClient;
     }
-    async execute(installationId, functionKey, isProduction) {
+    async execute(installationId, functionKey) {
         const { id: appId } = await this.getAppConfig();
-        const { product, site, environmentKey } = await this.webTriggerClient.getInstallation(appId, installationId);
-        const [environmentId, cloudId] = await Promise.all([
-            this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey),
-            this.globalEdgeClient.getCloudId(new url_1.URL(`https://${site}`))
-        ]);
-        const context = cli_shared_1.buildContextAri(cloudId, product);
+        const { environmentKey, context } = await this.webTriggerClient.getInstallation(appId, installationId);
+        const environmentId = await this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey);
         const ari = cs_ari_1.parse(appId);
         const appAri = cs_ari_1.parseAppAri(ari);
-        const extension = cli_shared_1.buildExtensionAri(appAri.appId, environmentId, functionKey);
-        return buildWebtriggerURL(appAri.appId, context, extension, isProduction);
+        return await this.webTriggerGraphqlClient.createWebTriggerUrl({
+            appId: appAri.appId,
+            contextId: context,
+            environmentId: environmentId,
+            triggerKey: functionKey
+        });
     }
 }
 exports.GetWebTriggerURLCommand = GetWebTriggerURLCommand;

package/out/webtrigger/graphql-client.d.ts

@@ -0,0 +1,14 @@
+import { GraphQLClient, GraphQlMutationError } from '@forge/cli-shared';
+import { WebTriggerUrlDetails } from './get-webtrigger-url';
+export declare class WebTriggerCreationError extends GraphQlMutationError {
+    constructor(message: string, code: string | undefined);
+}
+export declare class MissingWebTriggerUrlError extends GraphQlMutationError {
+    constructor(requestId: string | undefined);
+}
+export declare class WebTriggerGraphQLClient {
+    private readonly graphQLClient;
+    constructor(graphQLClient: GraphQLClient);
+    createWebTriggerUrl({ appId, contextId, environmentId, triggerKey }: WebTriggerUrlDetails): Promise<string>;
+}
+//# sourceMappingURL=graphql-client.d.ts.map

package/out/webtrigger/graphql-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/webtrigger/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAyC,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,qBAAa,uBAAwB,SAAQ,oBAAoB;gBACnD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,yBAA0B,SAAQ,oBAAoB;gBACrD,SAAS,EAAE,MAAM,GAAG,SAAS;CAO1C;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,mBAAmB,CAAC,EAC/B,KAAK,EACL,SAAS,EACT,aAAa,EACb,UAAU,EACX,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;CAoC1C"}

package/out/webtrigger/graphql-client.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebTriggerGraphQLClient = exports.MissingWebTriggerUrlError = exports.WebTriggerCreationError = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+class WebTriggerCreationError extends cli_shared_1.GraphQlMutationError {
+    constructor(message, code) {
+        super(cli_shared_1.Text.webtrigger.error.creationError(message), code);
+    }
+}
+exports.WebTriggerCreationError = WebTriggerCreationError;
+class MissingWebTriggerUrlError extends cli_shared_1.GraphQlMutationError {
+    constructor(requestId) {
+        super(cli_shared_1.Text.webtrigger.error.creationError(`Web Trigger URL not found after successful creation, requestId: ${requestId !== null && requestId !== void 0 ? requestId : 'N/A'}`));
+    }
+}
+exports.MissingWebTriggerUrlError = MissingWebTriggerUrlError;
+class WebTriggerGraphQLClient {
+    constructor(graphQLClient) {
+        this.graphQLClient = graphQLClient;
+    }
+    async createWebTriggerUrl({ appId, contextId, environmentId, triggerKey }) {
+        const query = `
+        mutation forge_cli_createWebTriggerUrl($input: WebTriggerUrlInput!) {
+            createWebTriggerUrl(input: $input) {
+            statusCode
+            success
+            message
+            url
+            }
+        }
+        `;
+        const variables = {
+            input: {
+                appId,
+                contextId,
+                envId: environmentId,
+                triggerKey
+            }
+        };
+        const { response: { createWebTriggerUrl: { success, statusCode, message, url } }, requestId } = await this.graphQLClient.mutate(query, variables);
+        if (!success) {
+            throw new WebTriggerCreationError(message, statusCode.toString());
+        }
+        else {
+            if (url) {
+                return url;
+            }
+            throw new MissingWebTriggerUrlError(requestId);
+        }
+    }
+}
+exports.WebTriggerGraphQLClient = WebTriggerGraphQLClient;

package/out/workers/analytics-message-worker.d.ts

@@ -1,10 +1,12 @@
 import { AnalyticsMessage, MessageHandler } from '../analytics-client/analytics-message-handler';
+import { CachedConfigService } from '../service/cached-config-service';
 import { Storage } from '../storage/local-file-storage';
 import { Worker } from './worker';
 export declare class AnalyticsMessageWorker implements Worker {
     private readonly storage;
     private readonly messageHandler;
-    constructor(storage: Storage, messageHandler: MessageHandler<AnalyticsMessage | undefined>);
+    private readonly cachedConfigService;
+    constructor(storage: Storage, messageHandler: MessageHandler<AnalyticsMessage | undefined>, cachedConfigService: CachedConfigService);
     doWork(): Promise<void>;
 }
 //# sourceMappingURL=analytics-message-worker.d.ts.map

package/out/workers/analytics-message-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analytics-message-worker.d.ts","sourceRoot":"","sources":["../../src/workers/analytics-message-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,qBAAa,sBAAuB,YAAW,MAAM;IAEjD,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,cAAc;gBADd,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAGzE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAc9B"}
+{"version":3,"file":"analytics-message-worker.d.ts","sourceRoot":"","sources":["../../src/workers/analytics-message-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,qBAAa,sBAAuB,YAAW,MAAM;IAEjD,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAFnB,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,CAAC,gBAAgB,GAAG,SAAS,CAAC,EAC5D,mBAAmB,EAAE,mBAAmB;IAGrD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAoB9B"}

package/out/workers/analytics-message-worker.js

@@ -2,16 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsMessageWorker = void 0;
 class AnalyticsMessageWorker {
-    constructor(storage, messageHandler) {
+    constructor(storage, messageHandler, cachedConfigService) {
         this.storage = storage;
         this.messageHandler = messageHandler;
+        this.cachedConfigService = cachedConfigService;
     }
     async doWork() {
+        const analyticsSetting = this.cachedConfigService.getAnalyticsPreferences();
+        if (analyticsSetting === undefined) {
+            return;
+        }
         try {
             const events = this.storage.getAnalytics();
             await Promise.all(events.map(async (event) => {
                 const payload = await this.storage.getAnalyticsEvent(event);
-                await this.messageHandler.handleMessage(payload);
+                if (analyticsSetting) {
+                    await this.messageHandler.handleMessage(payload);
+                }
                 await this.storage.deleteAnalyticsEvent(event);
             }));
         }

package/out/workers/forge-cli-workers.js

@@ -5,9 +5,14 @@ const local_file_storage_1 = require("../storage/local-file-storage");
 const analytics_message_worker_1 = require("./analytics-message-worker");
 const worker_1 = require("./worker");
 const version_check_worker_1 = require("./version-check-worker");
+const cached_config_service_1 = require("../service/cached-config-service");
+const cli_shared_1 = require("@forge/cli-shared");
+const unique_machine_id_1 = require("../command-line/unique-machine-id");
 const workerInfo = JSON.parse(process.argv[2]);
+const cachedConf = cli_shared_1.CachedConf.getCache(unique_machine_id_1.FORGE_CLI_PACKAGE);
+const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
 const ALL_WORKERS = [
-    new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(workerInfo ? workerInfo.environment : undefined)),
+    new analytics_message_worker_1.AnalyticsMessageWorker(new local_file_storage_1.LocalFileStorage(), new analytics_message_handler_1.AnalyticsMessageHandler(workerInfo ? workerInfo.environment : undefined), cachedConfigService),
     new version_check_worker_1.VersionCheckWorker(workerInfo)
 ];
 const TIMEOUT = 10 * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "0.0.0-experimental-e8bfa83",
+  "version": "0.0.0-experimental-c3effe3",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,18 +18,18 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "0.0.0-experimental-e8bfa83",
-    "@forge/cli-shared": "0.0.0-experimental-e8bfa83",
-    "@forge/lint": "0.0.0-experimental-e8bfa83",
-    "@forge/manifest": "0.0.0-experimental-e8bfa83",
-    "@forge/util": "0.0.0-experimental-e8bfa83",
+    "@forge/bundler": "0.0.0-experimental-c3effe3",
+    "@forge/cli-shared": "0.0.0-experimental-c3effe3",
+    "@forge/lint": "0.0.0-experimental-c3effe3",
+    "@forge/manifest": "0.0.0-experimental-c3effe3",
+    "@forge/util": "1.2.0",
     "ajv": "^6.12.5",
-    "archiver": "^3.1.1",
+    "archiver": "^5.2.0",
     "case": "^1.6.2",
-    "cheerio": "^0.20.0",
-    "cli-table3": "^0.5.1",
+    "cheerio": "^0.22.0",
+    "cli-table3": "^0.6.1",
     "command-exists": "^1.2.8",
-    "commander": "^4.0.1",
+    "commander": "^7.0.0",
     "cross-spawn": "^7.0.1",
     "dayjs": "^1.9.7",
     "didyoumean": "^1.2.1",
@@ -37,11 +37,11 @@
     "fs-extra": "^8.1.0",
     "hidefile": "^3.0.0",
     "latest-version": "^5.1.0",
+    "lodash": "^4.17.20",
     "mkdirp": "^1.0.3",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "2.6.1",
     "node-machine-id": "^1.1.12",
     "omelette": "^0.4.15-1",
-    "open": "^6.4.0",
     "ora": "^4.0.3",
     "portfinder": "^1.0.25",
     "sanitize-filename": "^1.6.3",
@@ -51,7 +51,7 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@types/archiver": "^3.0.0",
+    "@types/archiver": "^5.1.0",
     "@types/cheerio": "^0.22.21",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.1",
@@ -70,14 +70,14 @@
     "@types/tmp": "^0.1.0",
     "@types/unzipper": "^0.10.1",
     "@types/uuid": "^3.4.7",
-    "@types/webpack": "4.39.8",
+    "@types/webpack": "^5.28.0",
     "jest-fixtures": "^0.6.0",
-    "memfs": "^2.17.1"
+    "memfs": "^3.4.1"
   },
   "optionalDependencies": {
-    "keytar": "^5.0.0"
+    "keytar": "^7.9.0"
   },
   "engines": {
-    "node": ">=8.3"
+    "node": ">=12.13.1"
   }
 }

package/out/bin/preinstall.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=preinstall.d.ts.map

package/out/bin/preinstall.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"preinstall.d.ts","sourceRoot":"","sources":["../../src/bin/preinstall.ts"],"names":[],"mappings":""}

package/out/bin/preinstall.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cli_prerequisites_1 = require("../command-line/cli-prerequisites");
-async function main() {
-    cli_prerequisites_1.checkNodeVersion();
-    await cli_prerequisites_1.checkPythonVersion();
-}
-main();

package/out/command-line/cli-prerequisites.d.ts

@@ -1,3 +0,0 @@
-export declare function checkNodeVersion(): void;
-export declare function checkPythonVersion(): Promise<void>;
-//# sourceMappingURL=cli-prerequisites.d.ts.map

package/out/command-line/cli-prerequisites.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli-prerequisites.d.ts","sourceRoot":"","sources":["../../src/command-line/cli-prerequisites.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,IAAI,IAAI,CAMvC;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyBlD"}

package/out/command-line/cli-prerequisites.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPythonVersion = exports.checkNodeVersion = void 0;
-const child_process_1 = require("child_process");
-const semver_1 = require("semver");
-const version_info_1 = require("./version-info");
-const cli_shared_1 = require("@forge/cli-shared");
-function checkNodeVersion() {
-    const cliDetails = version_info_1.getCLIDetails();
-    if (cliDetails && !semver_1.satisfies(process.version, cliDetails.supportedNodeVersion)) {
-        console.error(cli_shared_1.Text.error.outdatedNodeVersion(cliDetails.supportedNodeVersion));
-        process.exit(1);
-    }
-}
-exports.checkNodeVersion = checkNodeVersion;
-function checkPythonVersion() {
-    return new Promise((resolve) => {
-        const opts = `-c "import platform; print(platform.python_version())"`;
-        let command = `python ${opts} || python2.7 ${opts}`;
-        if (process.env.PYTHON) {
-            command = `${process.env.PYTHON} ${opts}`;
-        }
-        child_process_1.exec(command, (err, stdout) => {
-            if (err) {
-                console.error(cli_shared_1.Text.error.failedGettingPythonVersion(err));
-                process.exit(1);
-            }
-            const pythonVersion = stdout.trim();
-            if (!pythonVersion.startsWith('2.')) {
-                console.error(cli_shared_1.Text.error.invalidPythonVersion(pythonVersion));
-                process.exit(1);
-            }
-            resolve();
-        });
-    });
-}
-exports.checkPythonVersion = checkPythonVersion;