@forge/tunnel 5.3.4 → 5.4.0-experimental-9fa730f

package/CHANGELOG.md

@@ -1,5 +1,125 @@
 # @forge/tunnel
 
+## 5.4.0-experimental-9fa730f
+
+### Patch Changes
+
+- @forge/bundler@4.18.0-experimental-9fa730f
+
+## 5.4.0
+
+### Minor Changes
+
+- 41ba7c6: Removing Cloudflare enable FF and ngrok tunnel implementation
+- fd7827d: User Error handling for ports already in use
+
+### Patch Changes
+
+- Updated dependencies [84550d3]
+- Updated dependencies [41ba7c6]
+- Updated dependencies [90f621b]
+- Updated dependencies [6c9b381]
+- Updated dependencies [eaa03f9]
+- Updated dependencies [694a970]
+  - @forge/cli-shared@5.4.0
+  - @forge/bundler@4.18.0
+  - @forge/csp@3.3.0
+
+## 5.4.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [90f621b]
+  - @forge/cli-shared@5.4.0-next.9
+  - @forge/bundler@4.18.0-next.10
+  - @forge/csp@3.3.0-next.1
+
+## 5.4.0-next.10
+
+### Patch Changes
+
+- @forge/cli-shared@5.4.0-next.8
+- @forge/bundler@4.18.0-next.9
+
+## 5.4.0-next.9
+
+### Patch Changes
+
+- @forge/cli-shared@5.4.0-next.7
+- @forge/bundler@4.18.0-next.8
+
+## 5.4.0-next.8
+
+### Patch Changes
+
+- Updated dependencies [694a970]
+  - @forge/cli-shared@5.4.0-next.6
+  - @forge/bundler@4.18.0-next.7
+
+## 5.4.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [4117f97]
+  - @forge/cli-shared@5.4.0-next.5
+  - @forge/bundler@4.18.0-next.6
+  - @forge/csp@3.3.0-next.0
+
+## 5.4.0-next.6
+
+### Patch Changes
+
+- Updated dependencies [6c9b381]
+- Updated dependencies [eaa03f9]
+  - @forge/bundler@4.17.6-next.5
+
+## 5.4.0-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@5.4.0-next.4
+- @forge/bundler@4.17.6-next.4
+
+## 5.4.0-next.4
+
+### Minor Changes
+
+- fd7827d: User Error handling for ports already in use
+
+## 5.4.0-next.3
+
+### Patch Changes
+
+- Updated dependencies [84550d3]
+  - @forge/cli-shared@5.4.0-next.3
+  - @forge/bundler@4.17.6-next.3
+
+## 5.4.0-next.2
+
+### Patch Changes
+
+- @forge/cli-shared@5.4.0-next.2
+- @forge/bundler@4.17.6-next.2
+
+## 5.4.0-next.1
+
+### Patch Changes
+
+- @forge/cli-shared@5.4.0-next.1
+- @forge/bundler@4.17.6-next.1
+
+## 5.4.0-next.0
+
+### Minor Changes
+
+- 41ba7c6: Removing Cloudflare enable FF and ngrok tunnel implementation
+
+### Patch Changes
+
+- Updated dependencies [41ba7c6]
+  - @forge/cli-shared@5.4.0-next.0
+  - @forge/bundler@4.17.6-next.0
+
 ## 5.3.4
 
 ### Patch Changes

package/out/command/start-tunnel-command.d.ts

@@ -9,7 +9,6 @@ export interface StartTunnelOptions {
     port?: number;
     host: string;
     environmentKey: string;
-    ngrokConfig: string | undefined;
     resourcePortMap?: Record<string, number>;
 }
 export interface StartTunnelResult {

package/out/command/start-tunnel-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../src/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAyB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAG9D,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAsC,iBAAiB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAX7B,OAAO,CAAC,aAAa,CAAmE;IACxF,OAAO,CAAC,iBAAiB,CAAgC;gBAGtC,YAAY,EAAE,iBAAiB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,mBAAmB,EAClC,YAAY,EAAE,qBAAqB,EACnC,YAAY,EAAE,qBAAqB,EACnC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CAUlB;IAEF,OAAO,CAAC,qBAAqB,CA0B3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAyD9E"}
+{"version":3,"file":"start-tunnel-command.d.ts","sourceRoot":"","sources":["../../src/command/start-tunnel-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,EAAyB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAChH,OAAO,EAAE,SAAS,EAAqB,MAAM,gBAAgB,CAAC;AAI9D,OAAO,EACL,iBAAiB,EAKlB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAsC,iBAAiB,EAAE,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACzE,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAX7B,OAAO,CAAC,aAAa,CAAmE;IACxF,OAAO,CAAC,iBAAiB,CAAgC;gBAGtC,YAAY,EAAE,iBAAiB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,mBAAmB,EAClC,YAAY,EAAE,qBAAqB,EACnC,YAAY,EAAE,qBAAqB,EACnC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU;IAGzC,OAAO,CAAC,YAAY,CAUlB;IAEF,OAAO,CAAC,qBAAqB,CAuB3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAwD9E"}

package/out/command/start-tunnel-command.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
 const runtime_1 = require("@forge/runtime");
 const node_cache_1 = tslib_1.__importDefault(require("node-cache"));
+const portfinder_1 = require("portfinder");
 const servers_1 = require("../servers");
 const index_1 = require("../index");
 class StartTunnelCommand {
@@ -39,13 +40,12 @@ class StartTunnelCommand {
             this.cspReporterServer?.stop()
         ]);
     };
-    startFaaSTunnelServer = async ({ port, tunnelConfigPath, appId, environmentKey }) => {
+    startFaaSTunnelServer = async ({ port, appId, environmentKey }) => {
         const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
         const serverInfo = await this.devServer.start(port, permissions, remotes);
         const { id, token, url } = await this.tunnelClient.setupTunnel(appId, environmentKey);
         const faasTunnelUrl = await this.tunnelFactory.establishTunnel({
             port: serverInfo.port,
-            tunnelConfigPath,
             id,
             token,
             tunnelUrl: url
@@ -58,7 +58,8 @@ class StartTunnelCommand {
     startResourceBasedTunnelsServers = async (resourceDetails, options) => {
         const portMap = options.resourcePortMap ?? JSON.parse(process.env.RESOURCE_PORT_MAP ?? '{}');
         const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
-        const cspReporterPort = parseInt(process.env.CSP_REPORTER_PORT ?? '4000', 10);
+        const availablePort = await (0, portfinder_1.getPortPromise)({ port: 4000 });
+        const cspReporterPort = process.env.CSP_REPORTER_PORT ? parseInt(process.env.CSP_REPORTER_PORT, 10) : availablePort;
         if (resourceDetails.length === 0)
             return [];
         this.cspReporterServer = new servers_1.CspReporterServer(cspReporterPort, this.logger, new node_cache_1.default());
@@ -86,7 +87,6 @@ class StartTunnelCommand {
         try {
             const faasTunnelServer = await this.startFaaSTunnelServer({
                 port,
-                tunnelConfigPath: options.ngrokConfig,
                 appId,
                 environmentKey
             });

package/out/servers/csp-reporter-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csp-reporter-server.d.ts","sourceRoot":"","sources":["../../src/servers/csp-reporter-server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAEjD,OAAO,SAAS,MAAM,YAAY,CAAC;AAYnC,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAM;gBAGhB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS;IAwBnC,MAAM,IAAI,OAAO;IAIX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}
+{"version":3,"file":"csp-reporter-server.d.ts","sourceRoot":"","sources":["../../src/servers/csp-reporter-server.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAE5D,OAAO,SAAS,MAAM,YAAY,CAAC;AAYnC,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAPxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAM;gBAGhB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS;IAwBnC,MAAM,IAAI,OAAO;IAIX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}

package/out/servers/csp-reporter-server.js

@@ -36,7 +36,15 @@ class CspReporterServer {
     async start() {
         return new Promise((resolve, reject) => {
             this.server = this.app.listen(this.port, resolve);
-            this.server.on('error', reject);
+            this.server.on('error', (err) => {
+                const error = err;
+                if (error.code === 'EADDRINUSE') {
+                    reject(new cli_shared_1.UserError(`Port ${this.port} is already in use. Please select a different port by setting the CSP_REPORTER_PORT environment variable`));
+                }
+                else {
+                    reject(err);
+                }
+            });
         });
     }
     async stop() {

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

@@ -1,9 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import { URL } from 'url';
-import { BaseError, FeatureFlagService, Logger } from '@forge/cli-shared';
-export declare type NgrokTunnelConfig = {
-    tunnelConfigPath: string | undefined;
-};
+import { BaseError, Logger } from '@forge/cli-shared';
 export declare type CloudflareTunnelConfig = {
     token: string | null | undefined;
     id: string | null | undefined;
@@ -11,27 +8,13 @@ export declare type CloudflareTunnelConfig = {
 };
 export declare type TunnelConfig = {
     port: number;
-} & NgrokTunnelConfig & CloudflareTunnelConfig;
+} & CloudflareTunnelConfig;
 export interface CreateTunnelService {
-    establishTunnel({ port, tunnelConfigPath, token, id, tunnelUrl }: TunnelConfig): Promise<URL>;
+    establishTunnel({ port, token, id, tunnelUrl }: TunnelConfig): Promise<URL>;
     closeTunnel(): Promise<void>;
 }
-export declare const USER_NGROK_ERRORS: string[];
-export declare class NgrokError extends BaseError {
-    constructor(message?: string);
-    isUserError(): boolean;
-}
 export declare class CloudflareError extends BaseError {
 }
-export declare class TunnelServiceFacade implements CreateTunnelService {
-    private readonly featureFlagService;
-    private readonly logger;
-    private instance;
-    constructor(featureFlagService: FeatureFlagService, logger: Logger);
-    private getInstance;
-    establishTunnel({ port, tunnelConfigPath, id, token, tunnelUrl }: TunnelConfig): Promise<URL>;
-    closeTunnel(): Promise<void>;
-}
 export declare class CloudflareCreateTunnelService implements CreateTunnelService {
     private readonly logger;
     private stopFunction;
@@ -39,11 +22,4 @@ export declare class CloudflareCreateTunnelService implements CreateTunnelServic
     establishTunnel({ port, id, token, tunnelUrl }: TunnelConfig): Promise<URL>;
     closeTunnel(): Promise<void>;
 }
-export declare class NgrokCreateTunnelService implements CreateTunnelService {
-    private readonly logger;
-    private endpoint;
-    constructor(logger: Logger);
-    establishTunnel({ port, tunnelConfigPath }: TunnelConfig): Promise<URL>;
-    closeTunnel(): Promise<void>;
-}
 //# sourceMappingURL=create-tunnel-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"create-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/create-tunnel-service.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAGhF,oBAAY,iBAAiB,GAAG;IAC9B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,iBAAiB,GACnB,sBAAsB,CAAC;AAEzB,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9F,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAGD,eAAO,MAAM,iBAAiB,UAkB7B,CAAC;AACF,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,OAAO,CAAC,EAAE,MAAM;IAIrB,WAAW;CAGnB;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAKjD,qBAAa,mBAAoB,YAAW,mBAAmB;IAI3D,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,OAAO,CAAC,QAAQ,CAAkC;gBAG/B,kBAAkB,EAAE,kBAAkB,EACtC,MAAM,EAAE,MAAM;YAGnB,WAAW;IASZ,eAAe,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAI7F,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAG1C;AAED,qBAAa,6BAA8B,YAAW,mBAAmB;IAG3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,YAAY,CAA0E;gBAEjE,MAAM,EAAE,MAAM;IAE9B,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAwB3E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C;AAED,qBAAa,wBAAyB,YAAW,mBAAmB;IAGtD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,QAAQ,CAAqB;gBAER,MAAM,EAAE,MAAM;IAE9B,eAAe,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAsCvE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAkB1C"}
+{"version":3,"file":"create-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/create-tunnel-service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAE5D,oBAAY,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC;AAE3B,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,6BAA8B,YAAW,mBAAmB;IAG3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,YAAY,CAA0E;gBAEjE,MAAM,EAAE,MAAM;IAE9B,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAwB3E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C"}

package/out/services/create-tunnel-service.js

@@ -1,67 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NgrokCreateTunnelService = exports.CloudflareCreateTunnelService = exports.TunnelServiceFacade = exports.CloudflareError = exports.NgrokError = exports.USER_NGROK_ERRORS = void 0;
-const tslib_1 = require("tslib");
-const ngrok = tslib_1.__importStar(require("ngrok"));
+exports.CloudflareCreateTunnelService = exports.CloudflareError = void 0;
 const cloudflared_1 = require("cloudflared");
 const url_1 = require("url");
 const cli_shared_1 = require("@forge/cli-shared");
-const path_1 = tslib_1.__importDefault(require("path"));
-exports.USER_NGROK_ERRORS = [
-    'ERR_NGROK_105',
-    'ERR_NGROK_108',
-    'ERR_NGROK_120',
-    'ERR_NGROK_714',
-    'ERR_NGROK_715',
-    'ERR_NGROK_718',
-    'ERR_NGROK_720',
-    'ERR_NGROK_725',
-    'ERR_NGROK_726',
-    'ERR_NGROK_727',
-    'ERR_NGROK_728',
-    'ERR_NGROK_734',
-    'ERR_NGROK_1226',
-    'ERR_NGROK_3208',
-    'no such file or directory',
-    'The system cannot find the file specified',
-    'context canceled'
-];
-class NgrokError extends cli_shared_1.BaseError {
-    constructor(message) {
-        super(undefined, cli_shared_1.Text.tunnel.error.ngrok(message));
-    }
-    isUserError() {
-        return exports.USER_NGROK_ERRORS.some((err) => this.message.includes(err));
-    }
-}
-exports.NgrokError = NgrokError;
 class CloudflareError extends cli_shared_1.BaseError {
 }
 exports.CloudflareError = CloudflareError;
-class TunnelServiceFacade {
-    featureFlagService;
-    logger;
-    instance;
-    constructor(featureFlagService, logger) {
-        this.featureFlagService = featureFlagService;
-        this.logger = logger;
-    }
-    async getInstance() {
-        if (!this.instance) {
-            this.instance = (await this.featureFlagService.isCloudflareTunnelEnabled())
-                ? new CloudflareCreateTunnelService(this.logger)
-                : new NgrokCreateTunnelService(this.logger);
-        }
-        return this.instance;
-    }
-    async establishTunnel({ port, tunnelConfigPath, id, token, tunnelUrl }) {
-        return (await this.getInstance()).establishTunnel({ port, tunnelConfigPath, id, token, tunnelUrl });
-    }
-    async closeTunnel() {
-        return (await this.getInstance()).closeTunnel();
-    }
-}
-exports.TunnelServiceFacade = TunnelServiceFacade;
 class CloudflareCreateTunnelService {
     logger;
     stopFunction;
@@ -96,51 +41,3 @@ class CloudflareCreateTunnelService {
     }
 }
 exports.CloudflareCreateTunnelService = CloudflareCreateTunnelService;
-class NgrokCreateTunnelService {
-    logger;
-    endpoint;
-    constructor(logger) {
-        this.logger = logger;
-    }
-    async establishTunnel({ port, tunnelConfigPath }) {
-        const defaultConfigPath = path_1.default.join(__dirname, '..', '..', 'config', 'ngrok.yml');
-        let ngrokErrorMessage = undefined;
-        try {
-            const options = {
-                addr: port,
-                configPath: tunnelConfigPath ?? defaultConfigPath,
-                onStatusChange: (status) => {
-                    this.logger.debug(cli_shared_1.Text.tunnel.tunnelStatusChange(status));
-                },
-                onLogEvent: (data) => {
-                    const errorMatch = /err=(".+")$/m.exec(data);
-                    if (errorMatch && !data.includes('obj=updater')) {
-                        ngrokErrorMessage = errorMatch[1];
-                        try {
-                            ngrokErrorMessage = JSON.parse(ngrokErrorMessage);
-                        }
-                        catch { }
-                    }
-                    this.logger.debug(data);
-                }
-            };
-            this.endpoint = await ngrok.connect(options);
-            this.logger.debug(cli_shared_1.Text.tunnel.startedTunnel(this.endpoint));
-            return new url_1.URL(this.endpoint);
-        }
-        catch (e) {
-            throw new NgrokError(ngrokErrorMessage);
-        }
-    }
-    async closeTunnel() {
-        if (this.endpoint) {
-            try {
-                await ngrok.disconnect();
-                await ngrok.kill();
-            }
-            catch { }
-            this.endpoint = undefined;
-        }
-    }
-}
-exports.NgrokCreateTunnelService = NgrokCreateTunnelService;

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

@@ -1,5 +1,4 @@
 import { TunnelClient, TunnelDefinitions, TunnelSetup } from '../graphql';
-import { FeatureFlagService } from '@forge/cli-shared';
 export interface RegisterTunnelService {
     setupTunnel(appId: string, environmentKey: string): Promise<TunnelSetup>;
     registerTunnels(appId: string, environmentKey: string, tunnelDefinitions: TunnelDefinitions): Promise<void>;
@@ -7,8 +6,7 @@ export interface RegisterTunnelService {
 }
 export declare class RegisterTunnelServiceImpl implements RegisterTunnelService {
     private readonly tunnelClient;
-    private readonly featureFlagService;
-    constructor(tunnelClient: TunnelClient, featureFlagService: FeatureFlagService);
+    constructor(tunnelClient: TunnelClient);
     private keepAliveHandler;
     private keepAliveActive;
     registerTunnels(appId: string, environmentKey: string, tunnelDefinitions: TunnelDefinitions): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"register-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/register-tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAIvD,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACzE,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5G,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAED,qBAAa,yBAA0B,YAAW,qBAAqB;IAEnE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBADlB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB;IAKzD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,eAAe,CAAU;IAEpB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;IAQ3F,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAWjD,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;YAQtD,gBAAgB;IAoB9B,OAAO,CAAC,MAAM;CAaf"}
+{"version":3,"file":"register-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/register-tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAI1E,MAAM,WAAW,qBAAqB;IACpC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACzE,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5G,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAED,qBAAa,yBAA0B,YAAW,qBAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAIvD,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,eAAe,CAAU;IAEpB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;IAQ3F,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAIjD,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;YAQtD,gBAAgB;IAoB9B,OAAO,CAAC,MAAM;CAaf"}

package/out/services/register-tunnel-service.js

@@ -4,10 +4,8 @@ exports.RegisterTunnelServiceImpl = void 0;
 const ONE_DAY = 1000 * 60 * 60 * 24;
 class RegisterTunnelServiceImpl {
     tunnelClient;
-    featureFlagService;
-    constructor(tunnelClient, featureFlagService) {
+    constructor(tunnelClient) {
         this.tunnelClient = tunnelClient;
-        this.featureFlagService = featureFlagService;
         this.keepAliveActive = true;
     }
     keepAliveHandler;
@@ -20,14 +18,7 @@ class RegisterTunnelServiceImpl {
         await this.keepTunnelsAlive(appId, environmentKey, tunnelDefinitions, expiry);
     }
     async setupTunnel(appId, environmentKey) {
-        if (await this.featureFlagService.isCloudflareTunnelEnabled()) {
-            return await this.tunnelClient.setupTunnel(appId, environmentKey);
-        }
-        return {
-            token: undefined,
-            id: undefined,
-            url: undefined
-        };
+        return await this.tunnelClient.setupTunnel(appId, environmentKey);
     }
     async unregisterTunnels(appId, environmentKey) {
         if (this.keepAliveHandler) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "5.3.4",
+  "version": "5.4.0-experimental-9fa730f",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -11,17 +11,17 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "4.17.5",
-    "@forge/cli-shared": "5.3.2",
-    "@forge/csp": "3.2.2",
+    "@forge/bundler": "4.18.0-experimental-9fa730f",
+    "@forge/cli-shared": "5.4.0",
+    "@forge/csp": "3.3.0",
     "@forge/runtime": "5.10.1",
     "chokidar": "^3.6.0",
     "cloudflared": "^0.5.2",
     "express": "^4.18.3",
     "express-intercept": "^1.1.0",
     "http-proxy-middleware": "^2.0.6",
-    "ngrok": "^5.0.0-beta.2",
     "node-cache": "^5.1.2",
+    "portfinder": "^1.0.32",
     "tmp": "^0.2.3",
     "tslib": "^2.6.2",
     "uuid": "^9.0.1",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@atlassian/xen-test-util": "^4.2.0",
-    "@forge/manifest": "7.5.3",
+    "@forge/manifest": "7.6.0",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/node": "14.18.63",