wrangler 0.0.0-ea8f8d7 → 0.0.0-eab9542

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 (183) hide show
  1. package/README.md +7 -1
  2. package/bin/wrangler.js +114 -57
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +10 -2
  5. package/package.json +156 -152
  6. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  7. package/src/__tests__/config-cache.test.ts +30 -24
  8. package/src/__tests__/configuration.test.ts +3935 -3321
  9. package/src/__tests__/dev.test.tsx +1131 -871
  10. package/src/__tests__/guess-worker-format.test.ts +68 -68
  11. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  12. package/src/__tests__/helpers/faye-websocket.d.ts +4 -4
  13. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  14. package/src/__tests__/helpers/mock-bin.ts +20 -20
  15. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  16. package/src/__tests__/helpers/mock-console.ts +49 -39
  17. package/src/__tests__/helpers/mock-dialogs.ts +114 -51
  18. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  19. package/src/__tests__/helpers/mock-istty.ts +65 -18
  20. package/src/__tests__/helpers/mock-kv.ts +26 -26
  21. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  22. package/src/__tests__/helpers/mock-process.ts +39 -0
  23. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  24. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  25. package/src/__tests__/helpers/run-in-tmp.ts +27 -27
  26. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  27. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  28. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  29. package/src/__tests__/https-options.test.ts +104 -104
  30. package/src/__tests__/index.test.ts +239 -233
  31. package/src/__tests__/init.test.ts +1607 -1172
  32. package/src/__tests__/jest.setup.ts +63 -33
  33. package/src/__tests__/kv.test.ts +1136 -998
  34. package/src/__tests__/logger.test.ts +100 -74
  35. package/src/__tests__/package-manager.test.ts +312 -165
  36. package/src/__tests__/pages.test.ts +1177 -580
  37. package/src/__tests__/parse.test.ts +252 -252
  38. package/src/__tests__/publish.test.ts +6400 -5299
  39. package/src/__tests__/pubsub.test.ts +367 -0
  40. package/src/__tests__/r2.test.ts +133 -133
  41. package/src/__tests__/route.test.ts +18 -18
  42. package/src/__tests__/secret.test.ts +386 -381
  43. package/src/__tests__/tail.test.ts +530 -530
  44. package/src/__tests__/user.test.ts +123 -111
  45. package/src/__tests__/whoami.test.tsx +198 -83
  46. package/src/__tests__/worker-namespace.test.ts +327 -0
  47. package/src/abort.d.ts +1 -1
  48. package/src/api/dev.ts +52 -0
  49. package/src/api/index.ts +1 -0
  50. package/src/bundle-reporter.tsx +29 -0
  51. package/src/bundle.ts +158 -146
  52. package/src/cfetch/index.ts +80 -80
  53. package/src/cfetch/internal.ts +96 -86
  54. package/src/cli.ts +21 -7
  55. package/src/config/config.ts +204 -195
  56. package/src/config/diagnostics.ts +61 -61
  57. package/src/config/environment.ts +390 -357
  58. package/src/config/index.ts +206 -193
  59. package/src/config/validation-helpers.ts +366 -357
  60. package/src/config/validation.ts +1573 -1358
  61. package/src/config-cache.ts +79 -41
  62. package/src/create-worker-preview.ts +206 -136
  63. package/src/create-worker-upload-form.ts +247 -238
  64. package/src/dev/dev-vars.ts +13 -13
  65. package/src/dev/dev.tsx +333 -338
  66. package/src/dev/local.tsx +308 -274
  67. package/src/dev/remote.tsx +366 -211
  68. package/src/dev/use-esbuild.ts +126 -94
  69. package/src/dev.tsx +538 -0
  70. package/src/dialogs.tsx +111 -63
  71. package/src/durable.ts +87 -87
  72. package/src/entry.ts +234 -228
  73. package/src/environment-variables.ts +23 -23
  74. package/src/errors.ts +6 -6
  75. package/src/generate.ts +33 -0
  76. package/src/git-client.ts +42 -0
  77. package/src/https-options.ts +79 -79
  78. package/src/index.tsx +1773 -2691
  79. package/src/init.ts +549 -0
  80. package/src/inspect.ts +593 -593
  81. package/src/intl-polyfill.d.ts +123 -123
  82. package/src/is-interactive.ts +12 -0
  83. package/src/kv.ts +277 -277
  84. package/src/logger.ts +46 -39
  85. package/src/miniflare-cli/enum-keys.ts +8 -8
  86. package/src/miniflare-cli/index.ts +43 -31
  87. package/src/miniflare-cli/request-context.ts +18 -18
  88. package/src/module-collection.ts +212 -212
  89. package/src/open-in-browser.ts +4 -6
  90. package/src/package-manager.ts +133 -86
  91. package/src/pages/build.tsx +202 -0
  92. package/src/pages/constants.ts +7 -0
  93. package/src/pages/deployments.tsx +101 -0
  94. package/src/pages/dev.tsx +964 -0
  95. package/src/pages/functions/buildPlugin.ts +105 -0
  96. package/src/pages/functions/buildWorker.ts +151 -0
  97. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  98. package/src/pages/functions/filepath-routing.ts +189 -0
  99. package/src/pages/functions/identifiers.ts +78 -0
  100. package/src/pages/functions/routes.ts +151 -0
  101. package/src/pages/index.tsx +84 -0
  102. package/src/pages/projects.tsx +157 -0
  103. package/src/pages/publish.tsx +335 -0
  104. package/src/pages/types.ts +40 -0
  105. package/src/pages/upload.tsx +384 -0
  106. package/src/pages/utils.ts +12 -0
  107. package/src/parse.ts +209 -125
  108. package/src/paths.ts +6 -6
  109. package/src/preview.ts +31 -0
  110. package/src/proxy.ts +400 -389
  111. package/src/publish.ts +689 -505
  112. package/src/pubsub/index.ts +286 -0
  113. package/src/pubsub/pubsub-commands.tsx +577 -0
  114. package/src/r2.ts +19 -19
  115. package/src/selfsigned.d.ts +23 -23
  116. package/src/sites.tsx +278 -201
  117. package/src/tail/filters.ts +108 -108
  118. package/src/tail/index.ts +217 -217
  119. package/src/tail/printing.ts +45 -45
  120. package/src/update-check.ts +11 -11
  121. package/src/user/choose-account.tsx +60 -0
  122. package/src/user/env-vars.ts +46 -0
  123. package/src/user/generate-auth-url.ts +33 -0
  124. package/src/user/generate-random-state.ts +16 -0
  125. package/src/user/index.ts +3 -0
  126. package/src/user/user.tsx +1161 -0
  127. package/src/whoami.tsx +61 -41
  128. package/src/worker-namespace.ts +190 -0
  129. package/src/worker.ts +110 -99
  130. package/src/zones.ts +76 -0
  131. package/templates/checked-fetch.js +17 -0
  132. package/templates/new-worker-scheduled.js +17 -0
  133. package/templates/new-worker-scheduled.ts +32 -0
  134. package/templates/new-worker.js +3 -3
  135. package/templates/new-worker.ts +15 -15
  136. package/templates/no-op-worker.js +10 -0
  137. package/templates/pages-template-plugin.ts +155 -0
  138. package/templates/pages-template-worker.ts +161 -0
  139. package/templates/static-asset-facade.js +32 -36
  140. package/templates/tsconfig.json +95 -95
  141. package/wrangler-dist/cli.js +39087 -37488
  142. package/pages/functions/buildPlugin.ts +0 -105
  143. package/pages/functions/buildWorker.ts +0 -151
  144. package/pages/functions/filepath-routing.ts +0 -189
  145. package/pages/functions/identifiers.ts +0 -78
  146. package/pages/functions/routes.ts +0 -156
  147. package/pages/functions/template-plugin.ts +0 -147
  148. package/pages/functions/template-worker.ts +0 -143
  149. package/src/pages.tsx +0 -2024
  150. package/src/user.tsx +0 -1203
  151. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  152. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  153. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  154. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  155. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  156. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  157. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  158. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  159. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  160. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  161. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  163. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  164. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  165. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  166. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  167. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  168. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  169. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  170. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  171. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  172. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  173. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  174. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  175. package/vendor/wrangler-mime/LICENSE +0 -21
  176. package/vendor/wrangler-mime/Mime.js +0 -97
  177. package/vendor/wrangler-mime/README.md +0 -187
  178. package/vendor/wrangler-mime/cli.js +0 -46
  179. package/vendor/wrangler-mime/index.js +0 -4
  180. package/vendor/wrangler-mime/lite.js +0 -4
  181. package/vendor/wrangler-mime/package.json +0 -52
  182. package/vendor/wrangler-mime/types/other.js +0 -1
  183. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -4,32 +4,32 @@ const ORIGINAL_STDIN = process.stdin;
4
4
  * Mock process.stdin so that we can pipe in text for non-interactive mode tests.
5
5
  */
6
6
  export function useMockStdin({ isTTY }: { isTTY: boolean }) {
7
- const mockStdin = new MockStdIn(isTTY);
7
+ const mockStdin = new MockStdIn(isTTY);
8
8
 
9
- beforeEach(() => {
10
- mockStdin.reset();
11
- Object.defineProperty(process, "stdin", {
12
- value: mockStdin,
13
- configurable: true,
14
- writable: false,
15
- });
16
- });
9
+ beforeEach(() => {
10
+ mockStdin.reset();
11
+ Object.defineProperty(process, "stdin", {
12
+ value: mockStdin,
13
+ configurable: true,
14
+ writable: false,
15
+ });
16
+ });
17
17
 
18
- afterEach(() => {
19
- Object.defineProperty(process, "stdin", {
20
- value: ORIGINAL_STDIN,
21
- configurable: true,
22
- writable: false,
23
- });
24
- });
18
+ afterEach(() => {
19
+ Object.defineProperty(process, "stdin", {
20
+ value: ORIGINAL_STDIN,
21
+ configurable: true,
22
+ writable: false,
23
+ });
24
+ });
25
25
 
26
- return mockStdin;
26
+ return mockStdin;
27
27
  }
28
28
 
29
29
  const failCallback: (value: unknown) => void = () => {
30
- throw new Error(
31
- "TEST FAILURE: stdin callback called before being initialized."
32
- );
30
+ throw new Error(
31
+ "TEST FAILURE: stdin callback called before being initialized."
32
+ );
33
33
  };
34
34
 
35
35
  /**
@@ -37,67 +37,72 @@ const failCallback: (value: unknown) => void = () => {
37
37
  * into the wrangler process in non-interactive mode.
38
38
  */
39
39
  class MockStdIn {
40
- private endCallback = failCallback;
41
- private errorCallback = failCallback;
42
- private chunks: string[] = [];
43
- private error: Error | undefined;
40
+ private endCallback = failCallback;
41
+ private errorCallback = failCallback;
42
+ private chunks: string[] = [];
43
+ private error: Error | undefined;
44
44
 
45
- /**
46
- * Set this to true if you want the stdin stream to error.
47
- */
48
- throwError(error: Error) {
49
- this.error = error;
50
- }
45
+ /**
46
+ * Set this to true if you want the stdin stream to error.
47
+ */
48
+ throwError(error: Error) {
49
+ this.error = error;
50
+ }
51
51
 
52
- /**
53
- * Call this to clean out the chunks that are queued for sending.
54
- */
55
- reset() {
56
- this.chunks.length = 0;
57
- this.error = undefined;
58
- }
52
+ /**
53
+ * Call this to clean out the chunks that are queued for sending.
54
+ */
55
+ reset() {
56
+ this.chunks.length = 0;
57
+ this.error = undefined;
58
+ }
59
59
 
60
- /**
61
- * Queue up some chunks to be sent.
62
- */
63
- send(...chunks: string[]) {
64
- this.chunks.push(...chunks);
65
- }
60
+ /**
61
+ * Queue up some chunks to be sent.
62
+ */
63
+ send(...chunks: string[]) {
64
+ this.chunks.push(...chunks);
65
+ }
66
66
 
67
- constructor(
68
- /**
69
- * Used by wrangler to check whether stdin is interactive.
70
- */
71
- readonly isTTY: boolean
72
- ) {}
67
+ constructor(
68
+ /**
69
+ * Used by wrangler to check whether stdin is interactive.
70
+ */
71
+ readonly isTTY: boolean
72
+ ) {}
73
73
 
74
- /**
75
- * Used by wrangler to add event listeners.
76
- */
77
- on(eventName: string, callback: () => void) {
78
- switch (eventName) {
79
- case "readable":
80
- setImmediate(callback);
81
- break;
82
- case "end":
83
- this.endCallback = callback;
84
- break;
85
- case "error":
86
- this.errorCallback = callback;
87
- break;
88
- }
89
- }
74
+ /**
75
+ * Used by wrangler to add event listeners.
76
+ */
77
+ on(eventName: string, callback: () => void) {
78
+ switch (eventName) {
79
+ case "readable":
80
+ setImmediate(callback);
81
+ break;
82
+ case "end":
83
+ this.endCallback = callback;
84
+ break;
85
+ case "error":
86
+ this.errorCallback = callback;
87
+ break;
88
+ }
89
+ }
90
90
 
91
- /**
92
- * Used by wrangler to get the next chunk of data in the stream.
93
- */
94
- read() {
95
- if (this.error) {
96
- setImmediate(() => this.errorCallback(this.error));
97
- }
98
- if (this.chunks.length === 0) {
99
- setImmediate(this.endCallback);
100
- }
101
- return this.chunks.shift() ?? null;
102
- }
91
+ /**
92
+ * Used by wrangler to get the next chunk of data in the stream.
93
+ */
94
+ read() {
95
+ if (this.error) {
96
+ setImmediate(() => this.errorCallback(this.error));
97
+ }
98
+ if (this.chunks.length === 0) {
99
+ setImmediate(this.endCallback);
100
+ }
101
+ return this.chunks.shift() ?? null;
102
+ }
103
+
104
+ /**
105
+ * Used by Ink.js to set the encoding of the stdout.
106
+ */
107
+ setEncoding() {}
103
108
  }
@@ -4,26 +4,26 @@ import { WebSocket } from "mock-socket";
4
4
  * A version of the mock WebSocket that supports the methods that we use.
5
5
  */
6
6
  export class MockWebSocket extends WebSocket {
7
- on(event: string | symbol, listener: (...args: unknown[]) => void): this {
8
- switch (event) {
9
- case "message":
10
- this.onmessage = ({ data }) => {
11
- listener(data);
12
- };
13
- break;
14
- case "open":
15
- this.onopen = listener;
16
- break;
17
- case "close":
18
- this.onclose = listener;
19
- break;
20
- default:
21
- throw new Error("Unknown event type: " + event.toString());
22
- }
23
- return this;
24
- }
7
+ on(event: string | symbol, listener: (...args: unknown[]) => void): this {
8
+ switch (event) {
9
+ case "message":
10
+ this.onmessage = ({ data }) => {
11
+ listener(data);
12
+ };
13
+ break;
14
+ case "open":
15
+ this.onopen = listener;
16
+ break;
17
+ case "close":
18
+ this.onclose = listener;
19
+ break;
20
+ default:
21
+ throw new Error("Unknown event type: " + event.toString());
22
+ }
23
+ return this;
24
+ }
25
25
 
26
- terminate() {
27
- this.close();
28
- }
26
+ terminate() {
27
+ this.close();
28
+ }
29
29
  }
@@ -6,34 +6,34 @@ import { reinitialiseAuthTokens } from "../../user";
6
6
  const originalCwd = process.cwd();
7
7
 
8
8
  export function runInTempDir({ homedir }: { homedir?: string } = {}) {
9
- let tmpDir: string;
9
+ let tmpDir: string;
10
10
 
11
- beforeAll(() => {
12
- if (tmpDir !== undefined) {
13
- process.chdir(originalCwd);
14
- fs.rmSync(tmpDir, { recursive: true });
15
- }
16
- });
11
+ beforeAll(() => {
12
+ if (tmpDir !== undefined) {
13
+ process.chdir(originalCwd);
14
+ fs.rmSync(tmpDir, { recursive: true });
15
+ }
16
+ });
17
17
 
18
- beforeEach(() => {
19
- tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "wrangler-tests"));
20
- process.chdir(tmpDir);
21
- if (homedir !== undefined) {
22
- // Override where the home directory is so that we can write our own user config,
23
- // without destroying the real thing.
24
- fs.mkdirSync(homedir);
25
- // Note it is very important that we use the "default" value from "node:os" (e.g. `import os from "node:os";`)
26
- // rather than an alias to the module (e.g. `import * as os from "node:os";`).
27
- // This is because the module gets transpiled so that the "method" `homedir()` gets converted to a
28
- // getter that is not configurable (and so cannot be spied upon).
29
- jest.spyOn(os, "homedir").mockReturnValue(homedir);
30
- // Now that we have changed the home directory location, we must reinitialize the user auth state
31
- reinitialiseAuthTokens();
32
- }
33
- });
18
+ beforeEach(() => {
19
+ tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "wrangler-tests"));
20
+ process.chdir(tmpDir);
21
+ if (homedir !== undefined) {
22
+ // Override where the home directory is so that we can write our own user config,
23
+ // without destroying the real thing.
24
+ fs.mkdirSync(homedir);
25
+ // Note it is very important that we use the "default" value from "node:os" (e.g. `import os from "node:os";`)
26
+ // rather than an alias to the module (e.g. `import * as os from "node:os";`).
27
+ // This is because the module gets transpiled so that the "method" `homedir()` gets converted to a
28
+ // getter that is not configurable (and so cannot be spied upon).
29
+ jest.spyOn(os, "homedir").mockReturnValue(homedir);
30
+ // Now that we have changed the home directory location, we must reinitialize the user auth state
31
+ reinitialiseAuthTokens();
32
+ }
33
+ });
34
34
 
35
- afterEach(() => {
36
- process.chdir(originalCwd);
37
- fs.rmSync(tmpDir, { recursive: true });
38
- });
35
+ afterEach(() => {
36
+ process.chdir(originalCwd);
37
+ fs.rmSync(tmpDir, { recursive: true });
38
+ });
39
39
  }
@@ -5,12 +5,12 @@ import { normalizeSlashes, stripTimings } from "./mock-console";
5
5
  * A helper to 'run' wrangler commands for tests.
6
6
  */
7
7
  export async function runWrangler(cmd?: string) {
8
- try {
9
- await main(cmd?.split(" ") ?? []);
10
- } catch (err) {
11
- if (err instanceof Error) {
12
- err.message = normalizeSlashes(stripTimings(err.message));
13
- }
14
- throw err;
15
- }
8
+ try {
9
+ await main(cmd?.split(" ") ?? []);
10
+ } catch (err) {
11
+ if (err instanceof Error) {
12
+ err.message = normalizeSlashes(stripTimings(err.message));
13
+ }
14
+ throw err;
15
+ }
16
16
  }
@@ -2,30 +2,30 @@ import fs from "node:fs";
2
2
 
3
3
  /** Write a mock Worker script to disk. */
4
4
  export function writeWorkerSource({
5
- basePath = ".",
6
- format = "js",
7
- type = "esm",
5
+ basePath = ".",
6
+ format = "js",
7
+ type = "esm",
8
8
  }: {
9
- basePath?: string;
10
- format?: "js" | "ts" | "jsx" | "tsx" | "mjs";
11
- type?: "esm" | "sw";
9
+ basePath?: string;
10
+ format?: "js" | "ts" | "jsx" | "tsx" | "mjs";
11
+ type?: "esm" | "sw";
12
12
  } = {}) {
13
- if (basePath !== ".") {
14
- fs.mkdirSync(basePath, { recursive: true });
15
- }
16
- fs.writeFileSync(
17
- `${basePath}/index.${format}`,
18
- type === "esm"
19
- ? `import { foo } from "./another";
13
+ if (basePath !== ".") {
14
+ fs.mkdirSync(basePath, { recursive: true });
15
+ }
16
+ fs.writeFileSync(
17
+ `${basePath}/index.${format}`,
18
+ type === "esm"
19
+ ? `import { foo } from "./another";
20
20
  export default {
21
21
  async fetch(request) {
22
22
  return new Response('Hello' + foo);
23
23
  },
24
24
  };`
25
- : `import { foo } from "./another";
25
+ : `import { foo } from "./another";
26
26
  addEventListener('fetch', event => {
27
27
  event.respondWith(new Response('Hello' + foo));
28
28
  })`
29
- );
30
- fs.writeFileSync(`${basePath}/another.${format}`, `export const foo = 100;`);
29
+ );
30
+ fs.writeFileSync(`${basePath}/another.${format}`, `export const foo = 100;`);
31
31
  }
@@ -4,14 +4,14 @@ import type { RawConfig } from "../../config";
4
4
 
5
5
  /** Write a mock wrangler.toml file to disk. */
6
6
  export default function writeWranglerToml(config: RawConfig = {}) {
7
- fs.writeFileSync(
8
- "./wrangler.toml",
9
- TOML.stringify({
10
- compatibility_date: "2022-01-12",
11
- name: "test-name",
12
- ...(config as TOML.JsonMap),
13
- }),
7
+ fs.writeFileSync(
8
+ "./wrangler.toml",
9
+ TOML.stringify({
10
+ compatibility_date: "2022-01-12",
11
+ name: "test-name",
12
+ ...(config as TOML.JsonMap),
13
+ }),
14
14
 
15
- "utf-8"
16
- );
15
+ "utf-8"
16
+ );
17
17
  }
@@ -6,125 +6,125 @@ import { mockConsoleMethods } from "./helpers/mock-console";
6
6
  import { runInTempDir } from "./helpers/run-in-tmp";
7
7
 
8
8
  describe("getHttpsOptions()", () => {
9
- runInTempDir({ homedir: "./home" });
10
- const std = mockConsoleMethods();
9
+ runInTempDir({ homedir: "./home" });
10
+ const std = mockConsoleMethods();
11
11
 
12
- it("should use cached values if they have not expired", async () => {
13
- fs.mkdirSync(resolve(os.homedir(), ".wrangler/local-cert"), {
14
- recursive: true,
15
- });
16
- fs.writeFileSync(
17
- resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
18
- "PRIVATE KEY"
19
- );
20
- fs.writeFileSync(
21
- resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
22
- "PUBLIC KEY"
23
- );
24
- const result = await getHttpsOptions();
25
- expect(result.key).toEqual("PRIVATE KEY");
26
- expect(result.cert).toEqual("PUBLIC KEY");
27
- expect(std.out).toMatchInlineSnapshot(`""`);
28
- expect(std.warn).toMatchInlineSnapshot(`""`);
29
- expect(std.err).toMatchInlineSnapshot(`""`);
30
- });
12
+ it("should use cached values if they have not expired", async () => {
13
+ fs.mkdirSync(resolve(os.homedir(), ".wrangler/local-cert"), {
14
+ recursive: true,
15
+ });
16
+ fs.writeFileSync(
17
+ resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
18
+ "PRIVATE KEY"
19
+ );
20
+ fs.writeFileSync(
21
+ resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
22
+ "PUBLIC KEY"
23
+ );
24
+ const result = await getHttpsOptions();
25
+ expect(result.key).toEqual("PRIVATE KEY");
26
+ expect(result.cert).toEqual("PUBLIC KEY");
27
+ expect(std.out).toMatchInlineSnapshot(`""`);
28
+ expect(std.warn).toMatchInlineSnapshot(`""`);
29
+ expect(std.err).toMatchInlineSnapshot(`""`);
30
+ });
31
31
 
32
- it("should generate and cache new keys if none are cached", async () => {
33
- const result = await getHttpsOptions();
34
- const key = fs.readFileSync(
35
- resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
36
- "utf8"
37
- );
38
- const cert = fs.readFileSync(
39
- resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
40
- "utf8"
41
- );
42
- expect(result.key).toEqual(key);
43
- expect(result.cert).toEqual(cert);
44
- expect(std.out).toMatchInlineSnapshot(
45
- `"Generating new self-signed certificate..."`
46
- );
47
- expect(std.warn).toMatchInlineSnapshot(`""`);
48
- expect(std.err).toMatchInlineSnapshot(`""`);
49
- });
32
+ it("should generate and cache new keys if none are cached", async () => {
33
+ const result = await getHttpsOptions();
34
+ const key = fs.readFileSync(
35
+ resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
36
+ "utf8"
37
+ );
38
+ const cert = fs.readFileSync(
39
+ resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
40
+ "utf8"
41
+ );
42
+ expect(result.key).toEqual(key);
43
+ expect(result.cert).toEqual(cert);
44
+ expect(std.out).toMatchInlineSnapshot(
45
+ `"Generating new self-signed certificate..."`
46
+ );
47
+ expect(std.warn).toMatchInlineSnapshot(`""`);
48
+ expect(std.err).toMatchInlineSnapshot(`""`);
49
+ });
50
50
 
51
- it("should generate and cache new keys if cached files have expired", async () => {
52
- fs.mkdirSync(resolve(os.homedir(), ".wrangler/local-cert"), {
53
- recursive: true,
54
- });
55
- const ORIGINAL_KEY = "EXPIRED PRIVATE KEY";
56
- const ORIGINAL_CERT = "EXPIRED PUBLIC KEY";
57
- fs.writeFileSync(
58
- resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
59
- ORIGINAL_KEY
60
- );
61
- fs.writeFileSync(
62
- resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
63
- ORIGINAL_CERT
64
- );
65
- mockStatSync(/\.pem$/, { mtimeMs: new Date(2000).valueOf() });
51
+ it("should generate and cache new keys if cached files have expired", async () => {
52
+ fs.mkdirSync(resolve(os.homedir(), ".wrangler/local-cert"), {
53
+ recursive: true,
54
+ });
55
+ const ORIGINAL_KEY = "EXPIRED PRIVATE KEY";
56
+ const ORIGINAL_CERT = "EXPIRED PUBLIC KEY";
57
+ fs.writeFileSync(
58
+ resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
59
+ ORIGINAL_KEY
60
+ );
61
+ fs.writeFileSync(
62
+ resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
63
+ ORIGINAL_CERT
64
+ );
65
+ mockStatSync(/\.pem$/, { mtimeMs: new Date(2000).valueOf() });
66
66
 
67
- const result = await getHttpsOptions();
68
- const key = fs.readFileSync(
69
- resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
70
- "utf8"
71
- );
72
- const cert = fs.readFileSync(
73
- resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
74
- "utf8"
75
- );
76
- expect(key).not.toEqual(ORIGINAL_KEY);
77
- expect(cert).not.toEqual(ORIGINAL_CERT);
78
- expect(result.key).toEqual(key);
79
- expect(result.cert).toEqual(cert);
80
- expect(std.out).toMatchInlineSnapshot(
81
- `"Generating new self-signed certificate..."`
82
- );
83
- expect(std.warn).toMatchInlineSnapshot(`""`);
84
- expect(std.err).toMatchInlineSnapshot(`""`);
85
- });
67
+ const result = await getHttpsOptions();
68
+ const key = fs.readFileSync(
69
+ resolve(os.homedir(), ".wrangler/local-cert/key.pem"),
70
+ "utf8"
71
+ );
72
+ const cert = fs.readFileSync(
73
+ resolve(os.homedir(), ".wrangler/local-cert/cert.pem"),
74
+ "utf8"
75
+ );
76
+ expect(key).not.toEqual(ORIGINAL_KEY);
77
+ expect(cert).not.toEqual(ORIGINAL_CERT);
78
+ expect(result.key).toEqual(key);
79
+ expect(result.cert).toEqual(cert);
80
+ expect(std.out).toMatchInlineSnapshot(
81
+ `"Generating new self-signed certificate..."`
82
+ );
83
+ expect(std.warn).toMatchInlineSnapshot(`""`);
84
+ expect(std.err).toMatchInlineSnapshot(`""`);
85
+ });
86
86
 
87
- it("should warn if not able to write to the cache", async () => {
88
- mockWriteFileSyncThrow(/\.pem$/);
89
- await getHttpsOptions();
90
- expect(
91
- fs.existsSync(resolve(os.homedir(), ".wrangler/local-cert/key.pem"))
92
- ).toBe(false);
93
- expect(
94
- fs.existsSync(resolve(os.homedir(), ".wrangler/local-cert/cert.pem"))
95
- ).toBe(false);
96
- expect(std.out).toMatchInlineSnapshot(
97
- `"Generating new self-signed certificate..."`
98
- );
99
- expect(std.warn).toMatchInlineSnapshot(`
87
+ it("should warn if not able to write to the cache", async () => {
88
+ mockWriteFileSyncThrow(/\.pem$/);
89
+ await getHttpsOptions();
90
+ expect(
91
+ fs.existsSync(resolve(os.homedir(), ".wrangler/local-cert/key.pem"))
92
+ ).toBe(false);
93
+ expect(
94
+ fs.existsSync(resolve(os.homedir(), ".wrangler/local-cert/cert.pem"))
95
+ ).toBe(false);
96
+ expect(std.out).toMatchInlineSnapshot(
97
+ `"Generating new self-signed certificate..."`
98
+ );
99
+ expect(std.warn).toMatchInlineSnapshot(`
100
100
  "â–² [WARNING] Unable to cache generated self-signed certificate in home/.wrangler/local-cert.
101
101
 
102
102
  ERROR: Cannot write file
103
103
 
104
104
  "
105
105
  `);
106
- expect(std.err).toMatchInlineSnapshot(`""`);
107
- });
106
+ expect(std.err).toMatchInlineSnapshot(`""`);
107
+ });
108
108
  });
109
109
 
110
110
  function mockStatSync(matcher: RegExp, stats: Partial<fs.Stats>) {
111
- const originalStatSync = jest.requireActual("node:fs").statSync;
112
- jest.spyOn(fs, "statSync").mockImplementation((statPath, options) => {
113
- return matcher.test(statPath.toString())
114
- ? (stats as fs.Stats)
115
- : originalStatSync(statPath, options);
116
- });
111
+ const originalStatSync = jest.requireActual("node:fs").statSync;
112
+ jest.spyOn(fs, "statSync").mockImplementation((statPath, options) => {
113
+ return matcher.test(statPath.toString())
114
+ ? (stats as fs.Stats)
115
+ : originalStatSync(statPath, options);
116
+ });
117
117
  }
118
118
 
119
119
  function mockWriteFileSyncThrow(matcher: RegExp) {
120
- const originalWriteFileSync = jest.requireActual("node:fs").writeFileSync;
121
- jest
122
- .spyOn(fs, "writeFileSync")
123
- .mockImplementation((filePath, data, options) => {
124
- if (matcher.test(filePath.toString())) {
125
- throw new Error("ERROR: Cannot write file");
126
- } else {
127
- return originalWriteFileSync(filePath, data, options);
128
- }
129
- });
120
+ const originalWriteFileSync = jest.requireActual("node:fs").writeFileSync;
121
+ jest
122
+ .spyOn(fs, "writeFileSync")
123
+ .mockImplementation((filePath, data, options) => {
124
+ if (matcher.test(filePath.toString())) {
125
+ throw new Error("ERROR: Cannot write file");
126
+ } else {
127
+ return originalWriteFileSync(filePath, data, options);
128
+ }
129
+ });
130
130
  }