@forge/cli-shared 9.4.1-next.3-experimental-e9e08bb → 9.4.1-next.4

package/CHANGELOG.md

@@ -1,20 +1,10 @@
 # @forge/cli-shared
 
-## 9.4.1-next.3-experimental-e9e08bb
-
-### Minor Changes
-
-- 067c20a: Add manifest-driven Docker local storage, seeding, reset, status, persistent lifecycle, and local
-  SDK routing for Forge tunnels. Simplify `forge storage entities indexes list` to
-  `forge storage indexes list`.
+## 9.4.1-next.4
 
 ### Patch Changes
 
-- Updated dependencies [a804b36]
-- Updated dependencies [db66d54]
-- Updated dependencies [40260f5]
-- Updated dependencies [0795370]
-  - @forge/manifest@13.4.0-next.3-experimental-e9e08bb
+- b7996ba: Fix tunnel debugging
 
 ## 9.4.1-next.3
 

package/out/file-system/archiver.d.ts

@@ -25,7 +25,7 @@ export declare class ZipArchiver extends Archiver {
 }
 export declare class DirectoryArchiver extends Archiver {
     private readonly target;
-    constructor(target: string);
+    constructor(target: string, clear?: boolean);
     addContent(fileName: string, contents: Buffer): void;
     addFrom(fileName: string, filePath: string): void;
     finalise(): Promise<string>;

package/out/file-system/archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/file-system/archiver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,8BAAsB,QAAQ;aACZ,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;aAKpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;aACjD,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAMpC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,IAAI;CAS5D;AAED,qBAAa,aAAc,SAAQ,SAAS;CAAG;AA4B/C,qBAAa,WAAY,SAAQ,QAAQ;IAMrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;IAElD,OAAO;WAaa,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAKzD,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAUjD,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIzC,OAAO,CAAC,cAAc,CAKpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH;AAED,qBAAa,iBAAkB,SAAQ,QAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM;IASpC,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAWpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU3C,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAGzC;AAED,qBAAa,aAAc,SAAQ,QAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,QAAQ,EAAE;IAI3C,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAM3C,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAIzC"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/file-system/archiver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,8BAAsB,QAAQ;aACZ,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;aAKpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;aACjD,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAMpC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,IAAI;CAS5D;AAED,qBAAa,aAAc,SAAQ,SAAS;CAAG;AA4B/C,qBAAa,WAAY,SAAQ,QAAQ;IAMrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAAmC;IAElD,OAAO;WAaa,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAKzD,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAUjD,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAS3B,SAAS,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAIzC,OAAO,CAAC,cAAc,CAKpB;IAEF,OAAO,CAAC,OAAO,CAIb;CACH;AAED,qBAAa,iBAAkB,SAAQ,QAAQ;IAE3C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,EAC/B,KAAK,UAAO;IAYP,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAWpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU3C,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAGzC;AAED,qBAAa,aAAc,SAAQ,QAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,QAAQ,EAAE;IAI3C,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpD,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAM3C,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAIzC"}

package/out/file-system/archiver.js

@@ -94,14 +94,16 @@ class ZipArchiver extends Archiver {
 exports.ZipArchiver = ZipArchiver;
 class DirectoryArchiver extends Archiver {
     target;
-    constructor(target) {
+    constructor(target, clear = true) {
         super();
         this.target = target;
-        try {
-            (0, fs_1.rmSync)(this.target, { recursive: true, force: true });
-        }
-        catch (e) {
-            throw new ArchiverError(e.message);
+        if (clear) {
+            try {
+                (0, fs_1.rmSync)(this.target, { recursive: true, force: true });
+            }
+            catch (e) {
+                throw new ArchiverError(e.message);
+            }
         }
     }
     addContent(fileName, contents) {

package/out/tunnel/docker-compose-lifecycle.d.ts

@@ -6,7 +6,6 @@ import { ChildProcess } from 'child_process';
 export declare const PROXY_SIDECAR_VOLUME_DIR = "/forge/container";
 export declare const CONTAINER_SERVICE_ASSETS = ".container-service-assets";
 export declare const K8S_AUTH_TOKEN_FILENAME = "local-account";
-export declare const DOCKER_LIFECYCLE_PATTERNS: readonly [RegExp, RegExp, RegExp, RegExp];
 export declare const STARTUP_TIMER_MS: number;
 export declare const STARTUP_TIMER_BUFFER_MS: number;
 export declare class InvalidContainerServicePort extends UserError {
@@ -33,9 +32,7 @@ export declare class DockerAuthenticationError extends UserError {
 export declare const generateContainersDockerComposeFile: (services: Services, appId: string, envId: string) => Promise<Record<string, string>>;
 export declare const deleteDockerComposeFile: (composeFile: string) => Promise<void>;
 export declare const startDockerComposeStack: (dockerComposeFilePath: string, serviceKey: string, logger: Logger) => Promise<void>;
-export declare const getDockerComposeErrorMessage: (error: unknown) => string;
 export declare const determineComposeFlags: (dockerComposeFilePath: string, serviceKey: string, logger: Logger) => Promise<string[]>;
 export declare const stopDockerComposeStack: (configFile: ConfigFile, logger: Logger, composeFiles?: Record<string, string>) => Promise<void>;
-export declare const createDockerLifecycleLogFilter: (logger: Logger) => (chunk: Buffer) => void;
 export declare const processDockerAuthentication: (childProcess: ChildProcess) => Promise<void>;
 //# sourceMappingURL=docker-compose-lifecycle.d.ts.map

package/out/tunnel/docker-compose-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker-compose-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/docker-compose-lifecycle.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAO3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,eAAO,MAAM,wBAAwB,qBAAqB,CAAC;AAC3D,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AACpE,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAsBvD,eAAO,MAAM,yBAAyB,2CAK5B,CAAC;AAKX,eAAO,MAAM,gBAAgB,QAAY,CAAC;AAC1C,eAAO,MAAM,uBAAuB,QAAW,CAAC;AAEhD,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK;CAG5C;AAED,qBAAa,+BAAgC,SAAQ,SAAS;gBAChD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,sCAAuC,SAAQ,SAAS;gBACvD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAMD,eAAO,MAAM,mCAAmC,GAAU,UAAU,QAAQ,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,oCAgFzG,CAAC;AAsFF,eAAO,MAAM,uBAAuB,GAAU,aAAa,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,GAAU,uBAAuB,MAAM,EAAE,YAAY,MAAM,EAAE,QAAQ,MAAM,kBA8B9G,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,OAAO,OAAO,KAAG,MAQ7D,CAAC;AAmBF,eAAO,MAAM,qBAAqB,GAChC,uBAAuB,MAAM,EAC7B,YAAY,MAAM,EAClB,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAgBlB,CAAC;AA2LF,eAAO,MAAM,sBAAsB,GACjC,YAAY,UAAU,EACtB,QAAQ,MAAM,EACd,eAAe,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,kBAmCtC,CAAC;AAQF,eAAO,MAAM,8BAA8B,GAAI,QAAQ,MAAM,MAGnD,OAAO,MAAM,SAetB,CAAC;AAMF,eAAO,MAAM,2BAA2B,GAAU,cAAc,YAAY,kBAW3E,CAAC"}
+{"version":3,"file":"docker-compose-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/docker-compose-lifecycle.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAO3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,eAAO,MAAM,wBAAwB,qBAAqB,CAAC;AAC3D,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AACpE,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAgCvD,eAAO,MAAM,gBAAgB,QAAY,CAAC;AAC1C,eAAO,MAAM,uBAAuB,QAAW,CAAC;AAEhD,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK;CAG5C;AAED,qBAAa,+BAAgC,SAAQ,SAAS;gBAChD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,sCAAuC,SAAQ,SAAS;gBACvD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAMD,eAAO,MAAM,mCAAmC,GAAU,UAAU,QAAQ,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,oCAgFzG,CAAC;AAsFF,eAAO,MAAM,uBAAuB,GAAU,aAAa,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,GAAU,uBAAuB,MAAM,EAAE,YAAY,MAAM,EAAE,QAAQ,MAAM,kBA8B9G,CAAC;AA6BF,eAAO,MAAM,qBAAqB,GAChC,uBAAuB,MAAM,EAC7B,YAAY,MAAM,EAClB,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAgBlB,CAAC;AA2LF,eAAO,MAAM,sBAAsB,GACjC,YAAY,UAAU,EACtB,QAAQ,MAAM,EACd,eAAe,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,kBAmCtC,CAAC;AAgCF,eAAO,MAAM,2BAA2B,GAAU,cAAc,YAAY,kBAW3E,CAAC"}

package/out/tunnel/docker-compose-lifecycle.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processDockerAuthentication = exports.createDockerLifecycleLogFilter = exports.stopDockerComposeStack = exports.determineComposeFlags = exports.getDockerComposeErrorMessage = exports.startDockerComposeStack = exports.deleteDockerComposeFile = exports.generateContainersDockerComposeFile = exports.DockerAuthenticationError = exports.CannotUseBothImageAndBuildContextError = exports.MissingImageOrBuildContextError = exports.UnableToParseDockerComposeFileError = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.InvalidContainerServicePort = exports.STARTUP_TIMER_BUFFER_MS = exports.STARTUP_TIMER_MS = exports.DOCKER_LIFECYCLE_PATTERNS = exports.K8S_AUTH_TOKEN_FILENAME = exports.CONTAINER_SERVICE_ASSETS = exports.PROXY_SIDECAR_VOLUME_DIR = void 0;
+exports.processDockerAuthentication = exports.stopDockerComposeStack = exports.determineComposeFlags = exports.startDockerComposeStack = exports.deleteDockerComposeFile = exports.generateContainersDockerComposeFile = exports.DockerAuthenticationError = exports.CannotUseBothImageAndBuildContextError = exports.MissingImageOrBuildContextError = exports.UnableToParseDockerComposeFileError = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.InvalidContainerServicePort = exports.STARTUP_TIMER_BUFFER_MS = exports.STARTUP_TIMER_MS = exports.K8S_AUTH_TOKEN_FILENAME = exports.CONTAINER_SERVICE_ASSETS = exports.PROXY_SIDECAR_VOLUME_DIR = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
@@ -28,7 +28,7 @@ const PROXY_SIDECAR_REGISTRIES = {
 };
 const isStagingEnvironment = () => process.env.FORGE_GRAPHQL_GATEWAY?.startsWith('https://api-private.stg.atlassian.com/graphql') ?? false;
 const getProxySidecarRegistry = (registryType) => PROXY_SIDECAR_REGISTRIES[registryType][isStagingEnvironment() ? 'staging' : 'production'];
-exports.DOCKER_LIFECYCLE_PATTERNS = [
+const LIFECYCLE_PATTERNS = [
     /Container .* (Starting|Started|Stopping|Stopped|Creating|Created|Recreated)/,
     /Network .* (Creating|Created|Removing|Removed)/,
     /Volume .* (Creating|Created|Removing|Removed)/,
@@ -217,7 +217,7 @@ const startDockerComposeStack = async (dockerComposeFilePath, serviceKey, logger
             await (0, docker_compose_1.pullOne)(PROXY_SIDECAR_SERVICE_NAME, pullOptions);
         }
         catch (ecrRegistryError) {
-            throw new DockerUnableToPullProxySidecarImage(new Error(`Initial pull error: ${(0, exports.getDockerComposeErrorMessage)(portableRegistryError)}. Retry error: ${(0, exports.getDockerComposeErrorMessage)(ecrRegistryError)}`));
+            throw new DockerUnableToPullProxySidecarImage(new Error(`Initial pull error: ${getDockerComposeErrorMessage(portableRegistryError)}. Retry error: ${getDockerComposeErrorMessage(ecrRegistryError)}`));
         }
     }
     await waitForContainersToStart(dockerComposeFilePath, serviceKey, logger);
@@ -230,7 +230,6 @@ const getDockerComposeErrorMessage = (error) => {
     }
     return error != null ? String(error) : 'Unknown Error Occurred.';
 };
-exports.getDockerComposeErrorMessage = getDockerComposeErrorMessage;
 const useEcrProxySidecarImage = (dockerComposeFilePath) => {
     const composeConfig = yaml.parse(fs.readFileSync(dockerComposeFilePath, 'utf8'));
     const proxySidecar = composeConfig?.services?.[PROXY_SIDECAR_SERVICE_NAME];
@@ -343,7 +342,7 @@ const waitForContainersToStart = async (dockerComposeFilePath, serviceKey, logge
             lines.forEach((line) => {
                 if (!line.trim())
                     return;
-                if (exports.DOCKER_LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
+                if (LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
                     logger.info(line);
                 }
             });
@@ -356,7 +355,7 @@ const waitForContainersToStart = async (dockerComposeFilePath, serviceKey, logge
             callback: logFilter
         }).catch((error) => {
             clearTimeout(startupTimer);
-            reject(new DockerUnableToStartError(new Error((0, exports.getDockerComposeErrorMessage)(error))));
+            reject(new DockerUnableToStartError(new Error(getDockerComposeErrorMessage(error))));
         });
         setTimeout(async () => {
             if (containersStarted)
@@ -400,7 +399,7 @@ const stopDockerComposeStack = async (configFile, logger, composeFiles) => {
                 log: false,
                 config: file,
                 composeOptions: [`-p${serviceKey}`],
-                callback: (0, exports.createDockerLifecycleLogFilter)(logger)
+                callback: createCustomLogFilter(logger)
             });
             await (0, exports.deleteDockerComposeFile)(file);
         }
@@ -411,7 +410,7 @@ const stopDockerComposeStack = async (configFile, logger, composeFiles) => {
     deleteContainerServiceAssetsDir();
 };
 exports.stopDockerComposeStack = stopDockerComposeStack;
-const createDockerLifecycleLogFilter = (logger) => {
+const createCustomLogFilter = (logger) => {
     let buffer = '';
     return (chunk) => {
         buffer += chunk.toString();
@@ -420,13 +419,12 @@ const createDockerLifecycleLogFilter = (logger) => {
         lines.forEach((line) => {
             if (!line.trim())
                 return;
-            if (exports.DOCKER_LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
+            if (LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
                 logger.info(line);
             }
         });
     };
 };
-exports.createDockerLifecycleLogFilter = createDockerLifecycleLogFilter;
 const processDockerAuthentication = async (childProcess) => {
     await new Promise((resolve, reject) => {
         childProcess.on('close', (code) => {

package/out/tunnel/index.d.ts

@@ -1,4 +1,3 @@
 export * from './docker-compose-lifecycle';
-export * from './compose-project-lifecycle';
 export * from './tunnel-options';
 //# sourceMappingURL=index.d.ts.map

package/out/tunnel/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tunnel/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tunnel/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC"}

package/out/tunnel/index.js

@@ -2,5 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./docker-compose-lifecycle"), exports);
-tslib_1.__exportStar(require("./compose-project-lifecycle"), exports);
 tslib_1.__exportStar(require("./tunnel-options"), exports);

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

@@ -8,13 +8,11 @@ export type TunnelCommandOptions = {
     verify?: boolean;
     url?: string;
     localPort?: number;
-    localStorage?: boolean;
 };
 export type TunnelOptions = Omit<TunnelCommandOptions, 'debugStartingPort'> & {
     debugStartingPort: number;
     assistantName?: string | null;
     containersDockerComposeFiles?: Record<string, string>;
-    localStorageCleanup?: () => Promise<void>;
 };
 export declare const defaultDebugStartingPort = 9229;
 export declare const defaultDebugHost = "127.0.0.1";

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-options.d.ts","sourceRoot":"","sources":["../../src/tunnel/tunnel-options.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,GAAG;IAC5E,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,4BAA4B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAC5C,eAAO,MAAM,uBAAuB,QAA8C,CAAC;AACnF,eAAO,MAAM,2BAA2B,EAAE,aAIzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,eAAO,MAAM,8BAA8B,OAAO,CAAC;AACnD,eAAO,MAAM,2CAA2C,OAAO,CAAC;AAQhE,wBAAsB,cAAc,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ1G"}
+{"version":3,"file":"tunnel-options.d.ts","sourceRoot":"","sources":["../../src/tunnel/tunnel-options.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,GAAG;IAC5E,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,4BAA4B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvD,CAAC;AAEF,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAC7C,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAC5C,eAAO,MAAM,uBAAuB,QAA8C,CAAC;AACnF,eAAO,MAAM,2BAA2B,EAAE,aAIzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,eAAO,MAAM,8BAA8B,OAAO,CAAC;AACnD,eAAO,MAAM,2CAA2C,OAAO,CAAC;AAQhE,wBAAsB,cAAc,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ1G"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "9.4.1-next.3-experimental-e9e08bb",
+  "version": "9.4.1-next.4",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -12,7 +12,7 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "13.4.0-next.3-experimental-e9e08bb",
+    "@forge/manifest": "13.4.0-next.3",
     "@forge/util": "3.0.0",
     "@forge/i18n": "1.0.0",
     "@sentry/node": "7.106.0",

package/out/tunnel/compose-project-lifecycle.d.ts

@@ -1,39 +0,0 @@
-import { Logger } from '../ui/logger';
-export interface ComposeCommandResult {
-    out?: string;
-    err?: string;
-    exitCode?: number;
-}
-export interface ComposeOptions {
-    cwd: string;
-    log: boolean;
-    config: string;
-    composeOptions: string[];
-    callback?: (chunk: Buffer) => void;
-}
-export interface ComposeAdapter {
-    pullOne(service: string, options: ComposeOptions): Promise<unknown>;
-    exec(command: string, args: string[], options: ComposeOptions): Promise<ComposeCommandResult>;
-    down(options: ComposeOptions): Promise<unknown>;
-}
-export interface ComposeServiceState {
-    name: string;
-    service: string;
-    state: string;
-    health?: string;
-}
-export declare class ComposeProjectLifecycle {
-    private readonly configPath;
-    private readonly projectName;
-    private readonly logger;
-    private readonly adapter;
-    constructor(configPath: string, projectName: string, logger: Logger, adapter?: ComposeAdapter);
-    private options;
-    pull(services: string[]): Promise<void>;
-    up(services: string[]): Promise<void>;
-    down(): Promise<void>;
-    states(): Promise<ComposeServiceState[]>;
-    logs(service: string, lines?: number): Promise<string>;
-}
-export declare const parseComposePs: (output: string) => ComposeServiceState[];
-//# sourceMappingURL=compose-project-lifecycle.d.ts.map

package/out/tunnel/compose-project-lifecycle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"compose-project-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/compose-project-lifecycle.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,MAAM,WAAW,oBAAoB;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9F,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAYD,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,cAA+B;IAG3D,OAAO,CAAC,OAAO;IAUF,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,MAAM,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;IASxC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAYhE;AAED,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,KAAG,mBAAmB,EAyBlE,CAAC"}

package/out/tunnel/compose-project-lifecycle.js

@@ -1,105 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseComposePs = exports.ComposeProjectLifecycle = void 0;
-const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-const docker_compose_1 = require("docker-compose");
-const docker_compose_lifecycle_1 = require("./docker-compose-lifecycle");
-const defaultAdapter = {
-    pullOne: (service, options) => (0, docker_compose_1.pullOne)(service, options),
-    exec: (command, args, options) => (0, docker_compose_1.execCompose)(command, args, options),
-    down: (options) => (0, docker_compose_1.downAll)(options)
-};
-class ComposeProjectLifecycle {
-    configPath;
-    projectName;
-    logger;
-    adapter;
-    constructor(configPath, projectName, logger, adapter = defaultAdapter) {
-        this.configPath = configPath;
-        this.projectName = projectName;
-        this.logger = logger;
-        this.adapter = adapter;
-    }
-    options(log = false) {
-        return {
-            cwd: path.dirname(this.configPath),
-            log,
-            config: this.configPath,
-            composeOptions: [`-p${this.projectName}`],
-            callback: (0, docker_compose_lifecycle_1.createDockerLifecycleLogFilter)(this.logger)
-        };
-    }
-    async pull(services) {
-        for (const service of services) {
-            try {
-                await this.adapter.pullOne(service, this.options());
-            }
-            catch (error) {
-                throw new Error(`Unable to pull the ${service} image: ${(0, docker_compose_lifecycle_1.getDockerComposeErrorMessage)(error)}`);
-            }
-        }
-    }
-    async up(services) {
-        try {
-            await this.adapter.exec('up', ['--detach', '--no-build', '--remove-orphans', ...services], this.options());
-        }
-        catch (error) {
-            throw new Error(`Unable to start the Docker Compose project: ${(0, docker_compose_lifecycle_1.getDockerComposeErrorMessage)(error)}`);
-        }
-    }
-    async down() {
-        try {
-            await this.adapter.down(this.options());
-        }
-        catch (error) {
-            throw new Error(`Unable to stop the Docker Compose project: ${(0, docker_compose_lifecycle_1.getDockerComposeErrorMessage)(error)}`);
-        }
-    }
-    async states() {
-        try {
-            const result = await this.adapter.exec('ps', ['--all', '--format', 'json'], this.options());
-            return (0, exports.parseComposePs)(result.out ?? '');
-        }
-        catch (error) {
-            throw new Error(`Unable to inspect the Docker Compose project: ${(0, docker_compose_lifecycle_1.getDockerComposeErrorMessage)(error)}`);
-        }
-    }
-    async logs(service, lines = 80) {
-        try {
-            const result = await this.adapter.exec('logs', ['--no-color', '--tail', lines.toString(), service], this.options());
-            return [result.out, result.err].filter(Boolean).join('\n').trim();
-        }
-        catch (error) {
-            return (0, docker_compose_lifecycle_1.getDockerComposeErrorMessage)(error);
-        }
-    }
-}
-exports.ComposeProjectLifecycle = ComposeProjectLifecycle;
-const parseComposePs = (output) => {
-    const trimmed = output.trim();
-    if (!trimmed)
-        return [];
-    const records = (() => {
-        try {
-            const parsed = JSON.parse(trimmed);
-            return Array.isArray(parsed) ? parsed : [parsed];
-        }
-        catch {
-            return trimmed
-                .split('\n')
-                .filter(Boolean)
-                .map((line) => JSON.parse(line));
-        }
-    })();
-    return records.map((item) => {
-        const value = item;
-        return {
-            name: String(value.Name ?? value.name ?? ''),
-            service: String(value.Service ?? value.service ?? ''),
-            state: String(value.State ?? value.state ?? ''),
-            health: value.Health == null && value.health == null ? undefined : String(value.Health ?? value.health)
-        };
-    });
-};
-exports.parseComposePs = parseComposePs;