@forge/tunnel 7.4.1-next.3 → 7.4.1-next.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/out/services/create-tunnel-service.d.ts.map +1 -1
  3. package/out/services/create-tunnel-service.js +16 -5
  4. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @forge/tunnel
2
2
 
3
+ ## 7.4.1-next.5
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [68fb732]
8
+ - @forge/util@4.0.1-next.0
9
+ - @forge/cli-shared@9.11.0-next.4
10
+ - @forge/bundler@7.3.3-next.5
11
+
12
+ ## 7.4.1-next.4
13
+
14
+ ### Patch Changes
15
+
16
+ - 9871b8c: Switch `forge tunnel` to `@atlassian/cloudflared`. It now updates the bundled cloudflared binary to at least 2026.10.3, and checks for newer versions every 14 days. Set `CLOUDFLARED_BIN` to use your own binary without updates.
17
+ - Updated dependencies [9871b8c]
18
+ - Updated dependencies [79c8030]
19
+ - Updated dependencies [e38146e]
20
+ - @forge/cli-shared@9.11.0-next.3
21
+ - @forge/bundler@7.3.3-next.4
22
+
3
23
  ## 7.4.1-next.3
4
24
 
5
25
  ### Patch Changes
package/out/services/create-tunnel-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/create-tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAI1B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAEvE,MAAM,MAAM,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,MAAM,MAAM,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;IAE3C,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,sBAAsB;IAgBjB,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IA2D3E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C"}
1
+ {"version":3,"file":"create-tunnel-service.d.ts","sourceRoot":"","sources":["../../src/services/create-tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAI1B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAC;AAEvE,MAAM,MAAM,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,MAAM,MAAM,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;AAoBjD,qBAAa,6BAA8B,YAAW,mBAAmB;IAG3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,YAAY,CAA0E;gBAEjE,MAAM,EAAE,MAAM;IAE3C,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,sBAAsB;IAgBjB,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAyD3E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C"}
package/out/services/create-tunnel-service.js CHANGED
@@ -10,6 +10,18 @@ const cli_shared_1 = require("@forge/cli-shared");
10
10
  class CloudflareError extends cli_shared_1.BaseError {
11
11
  }
12
12
  exports.CloudflareError = CloudflareError;
13
+ const CLOUDFLARED_MINIMUM_VERSION = '2026.10.3';
14
+ const CLOUDFLARED_CHECK_INTERVAL = 14 * 24 * 60 * 60 * 1000;
15
+ async function bundledCloudflared() {
16
+ const cloudflared = require('@atlassian/cloudflared');
17
+ if (!process.env.CLOUDFLARED_BIN) {
18
+ await cloudflared.install(cloudflared.bin, {
19
+ minimumVersion: CLOUDFLARED_MINIMUM_VERSION,
20
+ checkInterval: CLOUDFLARED_CHECK_INTERVAL
21
+ });
22
+ }
23
+ return fs_1.default.existsSync(cloudflared.bin) ? cloudflared.bin : null;
24
+ }
13
25
  class CloudflareCreateTunnelService {
14
26
  logger;
15
27
  stopFunction;
@@ -59,12 +71,11 @@ class CloudflareCreateTunnelService {
59
71
  let cloudflaredBinary = null;
60
72
  let usingLocalCloudflareBinary = false;
61
73
  try {
62
- const cloudflaredBin = require('cloudflared').bin;
63
- if (fs_1.default.existsSync(cloudflaredBin)) {
64
- cloudflaredBinary = cloudflaredBin;
65
- }
74
+ cloudflaredBinary = await bundledCloudflared();
75
+ }
76
+ catch (error) {
77
+ this.logger.debug(cli_shared_1.Text.tunnel.bundledCloudflaredUnavailable(error));
66
78
  }
67
- catch (error) { }
68
79
  try {
69
80
  if (!cloudflaredBinary) {
70
81
  cloudflaredBinary = await (0, which_1.default)('cloudflared', { nothrow: true });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/tunnel",
3
- "version": "7.4.1-next.3",
3
+ "version": "7.4.1-next.5",
4
4
  "description": "Tunnel functionality for Forge CLI",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -11,14 +11,14 @@
11
11
  "compile": "tsc -b -v"
12
12
  },
13
13
  "dependencies": {
14
- "@forge/bundler": "7.3.3-next.3",
15
- "@forge/cli-shared": "9.11.0-next.2",
14
+ "@atlassian/cloudflared": "^0.8.0",
15
+ "@forge/bundler": "7.3.3-next.5",
16
+ "@forge/cli-shared": "9.11.0-next.4",
16
17
  "@forge/csp": "6.4.1",
17
18
  "@forge/runtime": "7.0.3",
18
- "@forge/util": "^4.0.0",
19
+ "@forge/util": "^4.0.1-next.0",
19
20
  "cheerio": "^1.2.0",
20
21
  "chokidar": "^4.0.3",
21
- "cloudflared": "^0.7.3",
22
22
  "docker-compose": "^1.3.0",
23
23
  "express": "^4.18.3",
24
24
  "express-intercept": "^1.1.1",