wrangler 0.0.0-e2f9bb2 → 0.0.0-e30d1013

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 (295) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +26 -4
  3. package/bin/wrangler.js +154 -34
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +1451 -21
  6. package/package.json +191 -148
  7. package/src/__tests__/access.test.ts +25 -0
  8. package/src/__tests__/api-dev.test.ts +209 -0
  9. package/src/__tests__/api-devregistry.test.js +56 -0
  10. package/src/__tests__/api.test.ts +80 -0
  11. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  12. package/src/__tests__/config-cache.test.ts +30 -24
  13. package/src/__tests__/configuration.test.ts +3970 -3114
  14. package/src/__tests__/d1.test.ts +74 -0
  15. package/src/__tests__/delete.test.ts +230 -0
  16. package/src/__tests__/deployments.test.ts +91 -0
  17. package/src/__tests__/dev.test.tsx +1484 -737
  18. package/src/__tests__/dialogs.test.tsx +40 -0
  19. package/src/__tests__/generate.test.ts +235 -0
  20. package/src/__tests__/get-host-from-url.test.ts +16 -0
  21. package/src/__tests__/guess-worker-format.test.ts +68 -68
  22. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  23. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  24. package/src/__tests__/helpers/mock-bin.ts +20 -20
  25. package/src/__tests__/helpers/mock-cfetch.ts +216 -94
  26. package/src/__tests__/helpers/mock-console.ts +58 -39
  27. package/src/__tests__/helpers/mock-dialogs.ts +115 -51
  28. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  29. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  30. package/src/__tests__/helpers/mock-istty.ts +65 -18
  31. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  32. package/src/__tests__/helpers/mock-kv.ts +27 -27
  33. package/src/__tests__/helpers/mock-oauth-flow.ts +225 -228
  34. package/src/__tests__/helpers/mock-process.ts +39 -0
  35. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  36. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  37. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  38. package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
  39. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  40. package/src/__tests__/helpers/msw/handlers/oauth.ts +36 -0
  41. package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
  42. package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
  43. package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
  44. package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
  45. package/src/__tests__/helpers/msw/index.ts +21 -0
  46. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  47. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  48. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  49. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  50. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  51. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  52. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  53. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  54. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  55. package/src/__tests__/https-options.test.ts +142 -109
  56. package/src/__tests__/index.test.ts +244 -231
  57. package/src/__tests__/init.test.ts +2872 -1014
  58. package/src/__tests__/jest.setup.ts +163 -30
  59. package/src/__tests__/kv.test.ts +1660 -1439
  60. package/src/__tests__/logger.test.ts +100 -74
  61. package/src/__tests__/metrics.test.ts +450 -0
  62. package/src/__tests__/middleware.scheduled.test.ts +135 -0
  63. package/src/__tests__/middleware.test.ts +726 -0
  64. package/src/__tests__/package-manager.test.ts +312 -165
  65. package/src/__tests__/pages.test.ts +2380 -322
  66. package/src/__tests__/parse.test.ts +253 -245
  67. package/src/__tests__/paths.test.ts +39 -0
  68. package/src/__tests__/publish.test.ts +7536 -4778
  69. package/src/__tests__/pubsub.test.ts +370 -0
  70. package/src/__tests__/queues.test.ts +371 -0
  71. package/src/__tests__/r2.test.ts +388 -209
  72. package/src/__tests__/route.test.ts +18 -18
  73. package/src/__tests__/secret.test.ts +624 -426
  74. package/src/__tests__/tail.test.ts +677 -567
  75. package/src/__tests__/test-old-node-version.js +31 -0
  76. package/src/__tests__/type-generation.test.ts +225 -0
  77. package/src/__tests__/user.test.ts +140 -116
  78. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  79. package/src/__tests__/validate-dev-props.test.ts +56 -0
  80. package/src/__tests__/version.test.ts +35 -0
  81. package/src/__tests__/whoami.test.tsx +264 -91
  82. package/src/__tests__/worker-namespace.test.ts +326 -0
  83. package/src/abort.d.ts +3 -0
  84. package/src/api/dev.ts +208 -0
  85. package/src/api/index.ts +2 -0
  86. package/src/bundle-reporter.tsx +68 -0
  87. package/src/bundle.ts +781 -135
  88. package/src/cfetch/index.ts +123 -67
  89. package/src/cfetch/internal.ts +216 -90
  90. package/src/cli.ts +23 -8
  91. package/src/config/config.ts +236 -195
  92. package/src/config/diagnostics.ts +61 -61
  93. package/src/config/environment.ts +506 -339
  94. package/src/config/index.ts +309 -38
  95. package/src/config/validation-helpers.ts +379 -357
  96. package/src/config/validation.ts +1942 -1263
  97. package/src/config-cache.ts +81 -41
  98. package/src/create-worker-preview.ts +239 -132
  99. package/src/create-worker-upload-form.ts +300 -224
  100. package/src/d1/backups.tsx +218 -0
  101. package/src/d1/constants.ts +2 -0
  102. package/src/d1/create.tsx +63 -0
  103. package/src/d1/delete.tsx +56 -0
  104. package/src/d1/execute.tsx +344 -0
  105. package/src/d1/formatTimeAgo.ts +14 -0
  106. package/src/d1/index.ts +99 -0
  107. package/src/d1/list.tsx +48 -0
  108. package/src/d1/migrations.tsx +446 -0
  109. package/src/d1/options.ts +22 -0
  110. package/src/d1/types.tsx +24 -0
  111. package/src/d1/utils.ts +48 -0
  112. package/src/delete.ts +108 -0
  113. package/src/deployments.ts +77 -0
  114. package/src/deprecated/index.ts +438 -0
  115. package/src/dev/dev-vars.ts +20 -17
  116. package/src/dev/dev.tsx +522 -353
  117. package/src/dev/get-local-persistence-path.tsx +31 -0
  118. package/src/dev/local.tsx +726 -292
  119. package/src/dev/remote.tsx +591 -201
  120. package/src/dev/start-server.ts +519 -0
  121. package/src/dev/use-esbuild.ts +183 -97
  122. package/src/dev/validate-dev-props.ts +31 -0
  123. package/src/dev-registry.tsx +201 -0
  124. package/src/dev.tsx +868 -0
  125. package/src/dialogs.tsx +147 -65
  126. package/src/dispatch-namespace.ts +207 -0
  127. package/src/durable.ts +102 -0
  128. package/src/entry.ts +248 -186
  129. package/src/environment-variables.ts +38 -23
  130. package/src/errors.ts +6 -6
  131. package/src/git-client.ts +124 -0
  132. package/src/global-wrangler-config-path.ts +26 -0
  133. package/src/https-options.ts +84 -80
  134. package/src/index.tsx +632 -2564
  135. package/src/init.ts +970 -0
  136. package/src/inspect.ts +706 -562
  137. package/src/intl-polyfill.d.ts +123 -123
  138. package/src/is-ci.ts +14 -0
  139. package/src/is-interactive.ts +16 -0
  140. package/src/kv/helpers.ts +430 -0
  141. package/src/kv/index.ts +596 -0
  142. package/src/logger.ts +67 -41
  143. package/src/metrics/index.ts +5 -0
  144. package/src/metrics/metrics-config.ts +239 -0
  145. package/src/metrics/metrics-dispatcher.ts +96 -0
  146. package/src/metrics/metrics-usage-headers.ts +24 -0
  147. package/src/metrics/send-event.ts +94 -0
  148. package/src/miniflare-cli/assets.ts +215 -0
  149. package/src/miniflare-cli/index.ts +205 -33
  150. package/src/miniflare-cli/request-context.ts +18 -18
  151. package/src/module-collection.ts +221 -212
  152. package/src/open-in-browser.ts +5 -14
  153. package/src/package-manager.ts +182 -90
  154. package/src/pages/build.tsx +270 -0
  155. package/src/pages/constants.ts +18 -0
  156. package/src/pages/deployments.tsx +106 -0
  157. package/src/pages/dev.tsx +708 -0
  158. package/src/pages/errors.ts +66 -0
  159. package/src/pages/functions/buildPlugin.ts +106 -0
  160. package/src/pages/functions/buildWorker.ts +165 -0
  161. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  162. package/src/pages/functions/filepath-routing.ts +189 -0
  163. package/src/pages/functions/identifiers.ts +78 -0
  164. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  165. package/src/pages/functions/routes-consolidation.ts +73 -0
  166. package/src/pages/functions/routes-transformation.test.ts +282 -0
  167. package/src/pages/functions/routes-transformation.ts +115 -0
  168. package/src/pages/functions/routes-validation.test.ts +403 -0
  169. package/src/pages/functions/routes-validation.ts +202 -0
  170. package/src/pages/functions/routes.ts +151 -0
  171. package/src/pages/functions.tsx +82 -0
  172. package/src/pages/hash.tsx +13 -0
  173. package/src/pages/index.tsx +94 -0
  174. package/src/pages/projects.tsx +169 -0
  175. package/src/pages/publish.tsx +446 -0
  176. package/src/pages/types.ts +49 -0
  177. package/src/pages/upload.tsx +425 -0
  178. package/src/pages/utils.ts +12 -0
  179. package/src/parse.ts +223 -120
  180. package/src/paths.ts +53 -8
  181. package/src/proxy.ts +623 -388
  182. package/src/publish/index.ts +270 -0
  183. package/src/publish/publish.ts +1035 -0
  184. package/src/pubsub/index.ts +286 -0
  185. package/src/pubsub/pubsub-commands.tsx +624 -0
  186. package/src/queues/cli/commands/consumer/add.ts +71 -0
  187. package/src/queues/cli/commands/consumer/index.ts +22 -0
  188. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  189. package/src/queues/cli/commands/create.ts +25 -0
  190. package/src/queues/cli/commands/delete.ts +26 -0
  191. package/src/queues/cli/commands/index.ts +33 -0
  192. package/src/queues/cli/commands/list.ts +25 -0
  193. package/src/queues/client.ts +135 -0
  194. package/src/r2/constants.ts +4 -0
  195. package/src/r2/helpers.ts +131 -0
  196. package/src/r2/index.ts +289 -0
  197. package/src/routes.ts +140 -0
  198. package/src/secret/index.ts +378 -0
  199. package/src/selfsigned.d.ts +23 -23
  200. package/src/sites.tsx +281 -202
  201. package/src/tail/createTail.ts +315 -0
  202. package/src/tail/filters.ts +108 -110
  203. package/src/tail/index.ts +211 -296
  204. package/src/tail/printing.ts +86 -46
  205. package/src/type-generation.ts +173 -0
  206. package/src/update-check.ts +11 -11
  207. package/src/user/access.ts +69 -0
  208. package/src/user/choose-account.tsx +69 -0
  209. package/src/user/env-vars.ts +46 -0
  210. package/src/user/generate-auth-url.ts +33 -0
  211. package/src/user/generate-random-state.ts +16 -0
  212. package/src/user/index.ts +3 -0
  213. package/src/user/user.tsx +1192 -0
  214. package/src/utils/collectKeyValues.ts +14 -0
  215. package/src/whoami.tsx +141 -42
  216. package/src/worker.ts +174 -101
  217. package/src/yargs-types.ts +20 -0
  218. package/src/zones.ts +191 -0
  219. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  220. package/templates/checked-fetch.js +17 -0
  221. package/templates/d1-beta-facade.js +196 -0
  222. package/templates/experimental-local-cache-stubs.js +27 -0
  223. package/templates/first-party-worker-module-facade.ts +18 -0
  224. package/templates/format-dev-errors.ts +32 -0
  225. package/templates/init-tests/test-jest-new-worker.js +25 -0
  226. package/templates/init-tests/test-vitest-new-worker.js +26 -0
  227. package/templates/middleware/common.ts +62 -0
  228. package/templates/middleware/loader-modules.ts +84 -0
  229. package/templates/middleware/loader-sw.ts +213 -0
  230. package/templates/middleware/middleware-pretty-error.ts +40 -0
  231. package/templates/middleware/middleware-scheduled.ts +15 -0
  232. package/templates/new-worker-scheduled.js +17 -0
  233. package/templates/new-worker-scheduled.ts +32 -0
  234. package/templates/new-worker.js +3 -3
  235. package/templates/new-worker.ts +18 -3
  236. package/templates/no-op-worker.js +10 -0
  237. package/templates/pages-dev-pipeline.ts +28 -0
  238. package/templates/pages-dev-util.ts +52 -0
  239. package/templates/pages-shim.ts +9 -0
  240. package/templates/pages-template-plugin.ts +171 -0
  241. package/templates/pages-template-worker.ts +189 -0
  242. package/templates/serve-static-assets.ts +63 -0
  243. package/templates/service-bindings-module-facade.js +54 -0
  244. package/templates/service-bindings-sw-facade.js +42 -0
  245. package/templates/tsconfig.json +96 -95
  246. package/wrangler-dist/cli.d.ts +891 -0
  247. package/wrangler-dist/cli.js +101091 -50509
  248. package/pages/functions/buildPlugin.ts +0 -92
  249. package/pages/functions/buildWorker.ts +0 -138
  250. package/pages/functions/filepath-routing.ts +0 -189
  251. package/pages/functions/identifiers.ts +0 -78
  252. package/pages/functions/routes.ts +0 -156
  253. package/pages/functions/template-plugin.ts +0 -146
  254. package/pages/functions/template-worker.ts +0 -143
  255. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  256. package/src/kv.ts +0 -319
  257. package/src/miniflare-cli/enum-keys.ts +0 -17
  258. package/src/pages.tsx +0 -1866
  259. package/src/publish.ts +0 -469
  260. package/src/r2.ts +0 -50
  261. package/src/user.tsx +0 -1193
  262. package/templates/static-asset-facade.js +0 -47
  263. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  264. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  265. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  266. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  267. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  268. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  269. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  270. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  271. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  272. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  273. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  274. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  275. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  276. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  277. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  278. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  279. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  280. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  281. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  282. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  283. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  284. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  285. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  286. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  287. package/vendor/wrangler-mime/LICENSE +0 -21
  288. package/vendor/wrangler-mime/Mime.js +0 -97
  289. package/vendor/wrangler-mime/README.md +0 -187
  290. package/vendor/wrangler-mime/cli.js +0 -46
  291. package/vendor/wrangler-mime/index.js +0 -4
  292. package/vendor/wrangler-mime/lite.js +0 -4
  293. package/vendor/wrangler-mime/package.json +0 -52
  294. package/vendor/wrangler-mime/types/other.js +0 -1
  295. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -0,0 +1,124 @@
1
+ import fs from "node:fs";
2
+ import os from "node:os";
3
+ import path from "node:path";
4
+ import { execa } from "execa";
5
+ import { findUp } from "find-up";
6
+ import semiver from "semiver";
7
+
8
+ /**
9
+ * Check whether the given current working directory is within a git repository
10
+ * by looking for a `.git` directory in this or an ancestor directory.
11
+ */
12
+ export async function isInsideGitRepo(cwd: string) {
13
+ const res = await findUp(".git", { cwd, type: "directory" });
14
+ return res !== undefined;
15
+ }
16
+
17
+ /**
18
+ * Check whether git is installed by trying to run it.
19
+ *
20
+ * @returns a `string` containing the version of git that's installed, or `null` if git isn't installed
21
+ */
22
+ export async function getGitVersioon(): Promise<string | null> {
23
+ try {
24
+ const gitVersionExecutionResult = await execa("git", ["--version"]);
25
+ if (gitVersionExecutionResult.exitCode !== 0) {
26
+ return null;
27
+ }
28
+
29
+ const [gitVersion] =
30
+ /\d+.\d+.\d+/.exec(gitVersionExecutionResult.stdout) || [];
31
+ return gitVersion;
32
+ } catch (err) {
33
+ return null;
34
+ }
35
+ }
36
+
37
+ /**
38
+ * Initialize a new Worker project with a git repository.
39
+ *
40
+ * We want the branch to be called `main` but earlier versions of git do not support `--initial-branch`.
41
+ * If that is the case then we just fallback to the default initial branch name.
42
+ */
43
+ export async function initializeGit(cwd: string) {
44
+ try {
45
+ // Try to create the repository with the HEAD branch of `main`.
46
+ await execa("git", ["init", "--initial-branch", "main"], {
47
+ cwd,
48
+ });
49
+ } catch {
50
+ // Unable to create the repo with a HEAD branch name, so just fall back to the default.
51
+ await execa("git", ["init"], {
52
+ cwd,
53
+ });
54
+ }
55
+ }
56
+
57
+ /**
58
+ * Clone a repository into a given directory, optionally applying a given filter for a sparse checkout.
59
+ * Note: this does NOT initialize a git repository, that must be done separately.
60
+ *
61
+ * @param remote the remote repository to clone
62
+ * @param targetDirectory the directory to clone into
63
+ * @param subdirectory optional, clone a subdirectory instead of the whole repo
64
+ */
65
+ export async function cloneIntoDirectory(
66
+ remote: string,
67
+ targetDirectory: string,
68
+ subdirectory?: string
69
+ ) {
70
+ const args = ["clone", "--depth", "1"];
71
+
72
+ const gitVersion = await getGitVersioon();
73
+ if (!gitVersion) {
74
+ throw new Error("Failed to find git installation");
75
+ }
76
+
77
+ // sparse checkouts were added in git 2.26.0, and allow for...sparse...checkouts...
78
+ // basically it means you can checkout only certain files/folders/etc. instead of
79
+ // the whole repo. useful for monorepos that may, for example,
80
+ // contain multiple wrangler templates
81
+ const useSparseCheckout = subdirectory && semiver(gitVersion, "2.26.0") > -1;
82
+ if (useSparseCheckout) {
83
+ args.push("--filter=blob:none", "--sparse");
84
+ }
85
+
86
+ const tagIndex = remote.lastIndexOf("#");
87
+ if (tagIndex === -1) {
88
+ args.push(remote);
89
+ } else {
90
+ args.push("-b", remote.substring(tagIndex + 1));
91
+ args.push(remote.substring(0, tagIndex));
92
+ }
93
+
94
+ // we first clone into a temporary directory so that if something goes wrong,
95
+ // the user's filesystem isn't left in a messed-up state
96
+ const tempDir = fs.mkdtempSync(
97
+ path.join(os.tmpdir(), `wrangler-generate-repo-`)
98
+ );
99
+ args.push(tempDir);
100
+
101
+ await execa("git", args);
102
+
103
+ // if we can use sparse checkout, run it now.
104
+ // otherwise, the entire repo was cloned anyway, so skip this step
105
+ if (useSparseCheckout) {
106
+ await execa("git", [`sparse-checkout`, `set`, subdirectory], {
107
+ cwd: tempDir,
108
+ });
109
+ }
110
+
111
+ const templatePath =
112
+ subdirectory !== undefined ? path.join(tempDir, subdirectory) : tempDir;
113
+
114
+ // cleanup: move the template to the target directory and delete `.git`
115
+ try {
116
+ fs.renameSync(templatePath, targetDirectory);
117
+ } catch {
118
+ throw new Error(`Failed to find "${subdirectory}" in ${remote}`);
119
+ }
120
+ fs.rmSync(path.join(targetDirectory, ".git"), {
121
+ recursive: true,
122
+ force: true,
123
+ });
124
+ }
@@ -0,0 +1,26 @@
1
+ import fs from "node:fs";
2
+ import os from "node:os";
3
+ import path from "node:path";
4
+ import xdgAppPaths from "xdg-app-paths";
5
+
6
+ function isDirectory(configPath: string) {
7
+ try {
8
+ return fs.statSync(configPath).isDirectory();
9
+ } catch (error) {
10
+ // ignore error
11
+ return false;
12
+ }
13
+ }
14
+
15
+ export function getGlobalWranglerConfigPath() {
16
+ //TODO: We should implement a custom path --global-config and/or the WRANGLER_HOME type environment variable
17
+ const configDir = xdgAppPaths(".wrangler").config(); // New XDG compliant config path
18
+ const legacyConfigDir = path.join(os.homedir(), ".wrangler"); // Legacy config in user's home directory
19
+
20
+ // Check for the .wrangler directory in root if it is not there then use the XDG compliant path.
21
+ if (isDirectory(legacyConfigDir)) {
22
+ return legacyConfigDir;
23
+ } else {
24
+ return configDir;
25
+ }
26
+ }
@@ -1,7 +1,8 @@
1
1
  import * as fs from "node:fs";
2
- import { homedir, networkInterfaces } from "node:os";
2
+ import os from "node:os";
3
3
  import * as path from "node:path";
4
4
  import { promisify } from "node:util";
5
+ import { getGlobalWranglerConfigPath } from "./global-wrangler-config-path";
5
6
  import { logger } from "./logger";
6
7
  import type { Attributes, Options } from "selfsigned";
7
8
 
@@ -17,36 +18,39 @@ const ONE_DAY_IN_MS = 86400000;
17
18
  * The certificates are self-signed and generated locally, and cached in the `CERT_ROOT` directory.
18
19
  */
19
20
  export async function getHttpsOptions() {
20
- const certDirectory = path.join(homedir(), ".wrangler/local-cert");
21
- const keyPath = path.join(certDirectory, "key.pem");
22
- const certPath = path.join(certDirectory, "cert.pem");
21
+ const certDirectory = path.join(getGlobalWranglerConfigPath(), "local-cert");
22
+ const keyPath = path.join(certDirectory, "key.pem");
23
+ const certPath = path.join(certDirectory, "cert.pem");
23
24
 
24
- const regenerate =
25
- !fs.existsSync(keyPath) ||
26
- !fs.existsSync(certPath) ||
27
- hasCertificateExpired(keyPath, certPath);
25
+ const regenerate =
26
+ !fs.existsSync(keyPath) ||
27
+ !fs.existsSync(certPath) ||
28
+ hasCertificateExpired(keyPath, certPath);
28
29
 
29
- if (regenerate) {
30
- logger.log("Generating new self-signed certificate...");
31
- const { key, cert } = await generateCertificate();
32
- try {
33
- // Write certificate files so we can reuse them later.
34
- fs.mkdirSync(certDirectory, { recursive: true });
35
- fs.writeFileSync(keyPath, key, "utf8");
36
- fs.writeFileSync(certPath, cert, "utf8");
37
- } catch (e) {
38
- const message = e instanceof Error ? e.message : `${e}`;
39
- logger.warn(
40
- `Unable to cache generated self-signed certificate in ${certDirectory}.\n${message}`
41
- );
42
- }
43
- return { key, cert };
44
- } else {
45
- return {
46
- key: fs.readFileSync(keyPath, "utf8"),
47
- cert: fs.readFileSync(certPath, "utf8"),
48
- };
49
- }
30
+ if (regenerate) {
31
+ logger.log("Generating new self-signed certificate...");
32
+ const { key, cert } = await generateCertificate();
33
+ try {
34
+ // Write certificate files so we can reuse them later.
35
+ fs.mkdirSync(certDirectory, { recursive: true });
36
+ fs.writeFileSync(keyPath, key, "utf8");
37
+ fs.writeFileSync(certPath, cert, "utf8");
38
+ } catch (e) {
39
+ const message = e instanceof Error ? e.message : `${e}`;
40
+ logger.warn(
41
+ `Unable to cache generated self-signed certificate in ${path.relative(
42
+ process.cwd(),
43
+ certDirectory
44
+ )}.\n${message}`
45
+ );
46
+ }
47
+ return { key, cert };
48
+ } else {
49
+ return {
50
+ key: fs.readFileSync(keyPath, "utf8"),
51
+ cert: fs.readFileSync(certPath, "utf8"),
52
+ };
53
+ }
50
54
  }
51
55
 
52
56
  /**
@@ -54,70 +58,70 @@ export async function getHttpsOptions() {
54
58
  * have expired based on the date when they were last modified.
55
59
  */
56
60
  function hasCertificateExpired(keyPath: string, certPath: string): boolean {
57
- const keyStat = fs.statSync(keyPath);
58
- const certStat = fs.statSync(certPath);
59
- const created = Math.max(keyStat.mtimeMs, certStat.mtimeMs);
60
- return Date.now() - created > (CERT_EXPIRY_DAYS - 2) * ONE_DAY_IN_MS;
61
+ const keyStat = fs.statSync(keyPath);
62
+ const certStat = fs.statSync(certPath);
63
+ const created = Math.max(keyStat.mtimeMs, certStat.mtimeMs);
64
+ return Date.now() - created > (CERT_EXPIRY_DAYS - 2) * ONE_DAY_IN_MS;
61
65
  }
62
66
 
63
67
  /**
64
68
  * Generate a new self-signed certificate and cache it in `CERT_ROOT` directory.
65
69
  */
66
70
  async function generateCertificate() {
67
- // `selfsigned` imports `node-forge`, which is a pretty big library.
68
- // To reduce startup time, only load this dynamically when needed.
69
- // eslint-disable-next-line @typescript-eslint/consistent-type-imports
70
- const generate: typeof import("selfsigned").generate = promisify(
71
- // eslint-disable-next-line @typescript-eslint/no-var-requires
72
- require("selfsigned").generate
73
- );
71
+ // `selfsigned` imports `node-forge`, which is a pretty big library.
72
+ // To reduce startup time, only load this dynamically when needed.
73
+ // eslint-disable-next-line @typescript-eslint/consistent-type-imports
74
+ const generate: typeof import("selfsigned").generate = promisify(
75
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
76
+ require("selfsigned").generate
77
+ );
74
78
 
75
- const certAttrs: Attributes = [{ name: "commonName", value: "localhost" }];
79
+ const certAttrs: Attributes = [{ name: "commonName", value: "localhost" }];
76
80
 
77
- const certOptions: Options = {
78
- algorithm: "sha256",
79
- days: CERT_EXPIRY_DAYS,
80
- keySize: 2048,
81
- extensions: [
82
- { name: "basicConstraints", cA: true },
83
- {
84
- name: "keyUsage",
85
- keyCertSign: true,
86
- digitalSignature: true,
87
- nonRepudiation: true,
88
- keyEncipherment: true,
89
- dataEncipherment: true,
90
- },
91
- {
92
- name: "extKeyUsage",
93
- serverAuth: true,
94
- clientAuth: true,
95
- codeSigning: true,
96
- timeStamping: true,
97
- },
98
- {
99
- name: "subjectAltName",
100
- altNames: [
101
- { type: 2, value: "localhost" },
102
- ...getAccessibleHosts().map((ip) => ({ type: 7, ip })),
103
- ],
104
- },
105
- ],
106
- };
81
+ const certOptions: Options = {
82
+ algorithm: "sha256",
83
+ days: CERT_EXPIRY_DAYS,
84
+ keySize: 2048,
85
+ extensions: [
86
+ { name: "basicConstraints", cA: true },
87
+ {
88
+ name: "keyUsage",
89
+ keyCertSign: true,
90
+ digitalSignature: true,
91
+ nonRepudiation: true,
92
+ keyEncipherment: true,
93
+ dataEncipherment: true,
94
+ },
95
+ {
96
+ name: "extKeyUsage",
97
+ serverAuth: true,
98
+ clientAuth: true,
99
+ codeSigning: true,
100
+ timeStamping: true,
101
+ },
102
+ {
103
+ name: "subjectAltName",
104
+ altNames: [
105
+ { type: 2, value: "localhost" },
106
+ ...getAccessibleHosts().map((ip) => ({ type: 7, ip })),
107
+ ],
108
+ },
109
+ ],
110
+ };
107
111
 
108
- const { private: key, cert } = await generate(certAttrs, certOptions);
109
- return { key, cert };
112
+ const { private: key, cert } = await generate(certAttrs, certOptions);
113
+ return { key, cert };
110
114
  }
111
115
 
112
116
  /**
113
117
  * Ask the OS for the addresses of locally accessible hosts.
114
118
  */
115
119
  function getAccessibleHosts(ipv4 = false): string[] {
116
- const hosts: string[] = [];
117
- Object.values(networkInterfaces()).forEach((net) =>
118
- net?.forEach(({ family, address }) => {
119
- if (!ipv4 || family === "IPv4") hosts.push(address);
120
- })
121
- );
122
- return hosts;
120
+ const hosts: string[] = [];
121
+ Object.values(os.networkInterfaces()).forEach((net) =>
122
+ net?.forEach(({ family, address }) => {
123
+ if (!ipv4 || family === "IPv4") hosts.push(address);
124
+ })
125
+ );
126
+ return hosts;
123
127
  }