@forge/tunnel 5.1.0 → 5.2.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @forge/tunnel
 
+## 5.2.0-next.0
+
+### Minor Changes
+
+- 35b01cd: Move tunnel to Cloudflare
+
+### Patch Changes
+
+- Updated dependencies [35b01cd]
+  - @forge/cli-shared@4.2.0-next.0
+  - @forge/bundler@4.16.1-next.0
+
 ## 5.1.0
 
 ### Minor Changes

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,CAAC;IACpB,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,CAe3B;IAEF,OAAO,CAAC,gCAAgC,CAmCtC;IAEW,OAAO,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAoD9E"}
+{"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,CAAC;IACpB,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"}

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

@@ -30,10 +30,17 @@ class StartTunnelCommand {
                 (_a = this.cspReporterServer) === null || _a === void 0 ? void 0 : _a.stop()
             ]);
         };
-        this.startFaaSTunnelServer = async ({ port, tunnelConfigPath }) => {
+        this.startFaaSTunnelServer = async ({ port, tunnelConfigPath, appId, environmentKey }) => {
             const { permissions = {}, remotes = [] } = await this.configFile.readConfig();
             const serverInfo = await this.devServer.start(port, permissions, remotes);
-            const faasTunnelUrl = await this.tunnelFactory.establishTunnel({ port: serverInfo.port, tunnelConfigPath });
+            const { id, token, url } = await this.tunnelClient.setupTunnel(appId, environmentKey);
+            const faasTunnelUrl = await this.tunnelFactory.establishTunnel({
+                port: serverInfo.port,
+                tunnelConfigPath,
+                id,
+                token,
+                tunnelUrl: url
+            });
             return Object.assign(Object.assign({}, serverInfo), { tunnelUrl: faasTunnelUrl });
         };
         this.startResourceBasedTunnelsServers = async (resourceDetails, options) => {
@@ -60,7 +67,12 @@ class StartTunnelCommand {
         const { port, environmentKey } = options;
         const allResources = await this.configFile.getResources();
         try {
-            const faasTunnelServer = await this.startFaaSTunnelServer({ port, tunnelConfigPath: options.ngrokConfig });
+            const faasTunnelServer = await this.startFaaSTunnelServer({
+                port,
+                tunnelConfigPath: options.ngrokConfig,
+                appId,
+                environmentKey
+            });
             const customUITunnelsServers = await this.startResourceBasedTunnelsServers(allResources, options);
             const tunnelDefinitions = {
                 faasTunnelUrl: faasTunnelServer.tunnelUrl,

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

@@ -8,13 +8,20 @@ export interface TunnelDefinitions {
         tunnelUrl: URL;
     }[];
 }
+export interface TunnelSetup {
+    token: string | null | undefined;
+    id: string | null | undefined;
+    url: string | null | undefined;
+}
 export interface TunnelClient {
+    setupTunnel(appId: string, environmentKey: string): Promise<TunnelSetup>;
     createAppTunnels(appId: string, environmentKey: string, tunnelDefinitions: TunnelDefinitions): Promise<string | null | undefined>;
     deleteTunnels(appId: string, environmentKey: string): Promise<void>;
 }
 export declare class TunnelGraphqlClient implements TunnelClient {
     private readonly graphqlClient;
     constructor(graphqlClient: GraphQLClient);
+    setupTunnel(appId: string, environmentKey: string): Promise<TunnelSetup>;
     createAppTunnels(appId: string, environmentKey: string, tunnelDefinitions: TunnelDefinitions): Promise<string | null | undefined>;
     deleteTunnels(appId: string, environmentKey: string): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"tunnel-graphql-client.d.ts","sourceRoot":"","sources":["../../src/graphql/tunnel-graphql-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EACL,aAAa,EAKd,MAAM,mBAAmB,CAAC;AAqB3B,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,GAAG,CAAC;KAChB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,YAAY;IAC3B,gBAAgB,CACd,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IACtC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE;AAED,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,gBAAgB,CACpB,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IA0C/B,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAsC1E"}
+{"version":3,"file":"tunnel-graphql-client.d.ts","sourceRoot":"","sources":["../../src/graphql/tunnel-graphql-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EACL,aAAa,EAMd,MAAM,mBAAmB,CAAC;AA8B3B,MAAM,WAAW,iBAAiB;IAChC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,GAAG,CAAC;KAChB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9B,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAChC;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACzE,gBAAgB,CACd,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IACtC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE;AAED,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IA8CxE,gBAAgB,CACpB,KAAK,EAAE,MAAM,EACb,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IA0C/B,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAsC1E"}

package/out/graphql/tunnel-graphql-client.js

@@ -8,6 +8,11 @@ class CreateAppTunnelError extends cli_shared_1.GraphQlMutationError {
         super(cli_shared_2.Text.tunnel.error.create(message), { requestId, code, statusCode });
     }
 }
+class RegisterAppTunnelError extends cli_shared_1.GraphQlMutationError {
+    constructor(message, { requestId, code, statusCode }) {
+        super(cli_shared_2.Text.tunnel.error.create(message), { requestId, code, statusCode });
+    }
+}
 class DeleteAppTunnelError extends cli_shared_1.GraphQlMutationError {
     constructor(message, { requestId, code, statusCode }) {
         super(cli_shared_2.Text.tunnel.error.delete(message), { requestId, code, statusCode });
@@ -17,6 +22,44 @@ class TunnelGraphqlClient {
     constructor(graphqlClient) {
         this.graphqlClient = graphqlClient;
     }
+    async setupTunnel(appId, environmentKey) {
+        const mutation = `
+      mutation forge_cli_setupApplicationTunnel($input: RegisterTunnelInput!) {
+        registerTunnel(input: $input) {
+          success
+          errors {
+            message
+            extensions {
+              errorType
+              statusCode
+            }
+          }
+          tunnelId
+          tunnelToken
+          tunnelUrl
+        }
+      }
+    `;
+        const { response: { registerTunnel: { success, errors, tunnelId, tunnelToken, tunnelUrl } }, requestId } = await this.graphqlClient.mutate(mutation, {
+            input: {
+                appId,
+                environmentKey
+            }
+        });
+        const error = (0, cli_shared_1.getError)(errors);
+        if (!success) {
+            throw new RegisterAppTunnelError(`${error.message} (requestId: ${requestId || 'unknown'})`, {
+                requestId,
+                code: error.code,
+                statusCode: error.statusCode
+            });
+        }
+        return {
+            id: tunnelId,
+            token: tunnelToken,
+            url: tunnelUrl
+        };
+    }
     async createAppTunnels(appId, environmentKey, tunnelDefinitions) {
         const mutation = `
       mutation forge_cli_createApplicationTunnels($input: CreateAppTunnelsInput!) {

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

@@ -1,11 +1,19 @@
 /// <reference types="node" resolution-mode="require"/>
 import { URL } from 'url';
-import { BaseError, Logger } from '@forge/cli-shared';
+import { BaseError, FeatureFlagService, Logger } from '@forge/cli-shared';
+export declare type NgrokTunnelConfig = {
+    tunnelConfigPath: string | undefined;
+};
+export declare type CloudflareTunnelConfig = {
+    token: string | null | undefined;
+    id: string | null | undefined;
+    tunnelUrl: string | null | undefined;
+};
+export declare type TunnelConfig = {
+    port: number;
+} & NgrokTunnelConfig & CloudflareTunnelConfig;
 export interface CreateTunnelService {
-    establishTunnel({ port, tunnelConfigPath }: {
-        port: number;
-        tunnelConfigPath: string | undefined;
-    }): Promise<URL>;
+    establishTunnel({ port, tunnelConfigPath, token, id, tunnelUrl }: TunnelConfig): Promise<URL>;
     closeTunnel(): Promise<void>;
 }
 export declare const USER_NGROK_ERRORS: string[];
@@ -13,14 +21,29 @@ 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;
+    constructor(logger: Logger);
+    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 }: {
-        port: number;
-        tunnelConfigPath: string | undefined;
-    }): Promise<URL>;
+    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":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAG5D,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAClH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B;AAGD,eAAO,MAAM,iBAAiB,UAiB7B,CAAC;AACF,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,OAAO,CAAC,EAAE,MAAM;IAIrB,WAAW;CAGnB;AAED,qBAAa,wBAAyB,YAAW,mBAAmB;IAGtD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,QAAQ,CAAqB;gBAER,MAAM,EAAE,MAAM;IAE9B,eAAe,CAAC,EAC3B,IAAI,EACJ,gBAAgB,EACjB,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;KACtC,GAAG,OAAO,CAAC,GAAG,CAAC;IAsCH,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":";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,UAiB7B,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;IAsB3E,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"}

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NgrokCreateTunnelService = exports.NgrokError = exports.USER_NGROK_ERRORS = void 0;
+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"));
+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"));
@@ -33,6 +34,61 @@ class NgrokError extends cli_shared_1.BaseError {
     }
 }
 exports.NgrokError = NgrokError;
+class CloudflareError extends cli_shared_1.BaseError {
+}
+exports.CloudflareError = CloudflareError;
+class TunnelServiceFacade {
+    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 {
+    constructor(logger) {
+        this.logger = logger;
+    }
+    async establishTunnel({ port, id, token, tunnelUrl }) {
+        if (!id || !token || !tunnelUrl) {
+            throw new CloudflareError(undefined, 'Missing configuration to create tunnel');
+        }
+        const options = {
+            run: null,
+            '--token': token,
+            '--url': `localhost:${port}`
+        };
+        options[id] = null;
+        const { connections, stop } = (0, cloudflared_1.tunnel)(options);
+        await Promise.all(connections);
+        this.stopFunction = stop;
+        this.logger.debug(cli_shared_1.Text.tunnel.startedTunnel(tunnelUrl));
+        return new url_1.URL(tunnelUrl);
+    }
+    async closeTunnel() {
+        if (this.stopFunction) {
+            try {
+                this.stopFunction('SIGKILL');
+            }
+            catch (_a) { }
+            this.stopFunction = undefined;
+        }
+    }
+}
+exports.CloudflareCreateTunnelService = CloudflareCreateTunnelService;
 class NgrokCreateTunnelService {
     constructor(logger) {
         this.logger = logger;

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

@@ -1,14 +1,18 @@
-import { TunnelClient, TunnelDefinitions } from '../graphql';
+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>;
     unregisterTunnels(appId: string, environmentKey: string): Promise<void>;
 }
 export declare class RegisterTunnelServiceImpl implements RegisterTunnelService {
     private readonly tunnelClient;
-    constructor(tunnelClient: TunnelClient);
+    private readonly featureFlagService;
+    constructor(tunnelClient: TunnelClient, featureFlagService: FeatureFlagService);
     private keepAliveHandler;
     private keepAliveActive;
     registerTunnels(appId: string, environmentKey: string, tunnelDefinitions: TunnelDefinitions): Promise<void>;
+    setupTunnel(appId: string, environmentKey: string): Promise<TunnelSetup>;
     unregisterTunnels(appId: string, environmentKey: string): Promise<void>;
     private keepTunnelsAlive;
     private getTTL;

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,MAAM,YAAY,CAAC;AAI7D,MAAM,WAAW,qBAAqB;IACpC,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,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;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"}

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

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegisterTunnelServiceImpl = void 0;
 const ONE_DAY = 1000 * 60 * 60 * 24;
 class RegisterTunnelServiceImpl {
-    constructor(tunnelClient) {
+    constructor(tunnelClient, featureFlagService) {
         this.tunnelClient = tunnelClient;
+        this.featureFlagService = featureFlagService;
         this.keepAliveActive = true;
     }
     async registerTunnels(appId, environmentKey, tunnelDefinitions) {
@@ -14,6 +15,16 @@ class RegisterTunnelServiceImpl {
         const expiry = await this.tunnelClient.createAppTunnels(appId, environmentKey, tunnelDefinitions);
         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
+        };
+    }
     async unregisterTunnels(appId, environmentKey) {
         if (this.keepAliveHandler) {
             clearTimeout(this.keepAliveHandler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "5.1.0",
+  "version": "5.2.0-next.0",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -11,10 +11,11 @@
     "compile": "tsc -b -v"
   },
   "dependencies": {
-    "@forge/bundler": "4.16.0",
-    "@forge/cli-shared": "4.1.0",
+    "@forge/bundler": "4.16.1-next.0",
+    "@forge/cli-shared": "4.2.0-next.0",
     "@forge/csp": "3.2.1",
     "@forge/runtime": "5.8.0",
+    "cloudflared": "^0.5.1",
     "express": "^4.18.3",
     "express-intercept": "^1.1.0",
     "http-proxy-middleware": "^2.0.6",