wrangler 0.0.0-e30d1013 → 0.0.0-e3136f935

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 (270) hide show
  1. package/README.md +17 -15
  2. package/bin/wrangler.js +24 -93
  3. package/config-schema.json +3115 -0
  4. package/package.json +197 -192
  5. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  6. package/templates/__tests__/tsconfig.json +8 -0
  7. package/templates/checked-fetch.js +19 -6
  8. package/templates/facade.d.ts +19 -0
  9. package/templates/gitignore +2 -3
  10. package/templates/init-tests/test-jest-new-worker.js +3 -5
  11. package/templates/init-tests/test-vitest-new-worker.js +4 -6
  12. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  13. package/templates/middleware/common.ts +9 -4
  14. package/templates/middleware/loader-modules.ts +94 -44
  15. package/templates/middleware/loader-sw.ts +48 -32
  16. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  17. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  18. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  19. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  20. package/templates/middleware/middleware-scheduled.ts +15 -1
  21. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  22. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  23. package/templates/modules-watch-stub.js +4 -0
  24. package/templates/new-worker-scheduled.ts +1 -1
  25. package/templates/new-worker.ts +4 -1
  26. package/templates/pages-dev-pipeline.ts +6 -2
  27. package/templates/pages-dev-util.ts +4 -1
  28. package/templates/pages-shim.ts +1 -1
  29. package/templates/pages-template-plugin.ts +33 -14
  30. package/templates/pages-template-worker.ts +12 -3
  31. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  32. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  33. package/templates/tsconfig-sanity.ts +11 -0
  34. package/templates/tsconfig.init.json +22 -0
  35. package/templates/tsconfig.json +5 -103
  36. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  37. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  38. package/wrangler-dist/ProxyWorker.js +241 -0
  39. package/wrangler-dist/ProxyWorker.js.map +6 -0
  40. package/wrangler-dist/cli.d.ts +26093 -517
  41. package/wrangler-dist/cli.js +173222 -119058
  42. package/wrangler-dist/wasm-sync.wasm +0 -0
  43. package/Cloudflare_CA.pem +0 -18
  44. package/import_meta_url.js +0 -3
  45. package/miniflare-config-stubs/.env.empty +0 -0
  46. package/miniflare-config-stubs/package.empty.json +0 -1
  47. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  48. package/miniflare-dist/index.mjs +0 -6316
  49. package/src/__tests__/access.test.ts +0 -25
  50. package/src/__tests__/api-dev.test.ts +0 -209
  51. package/src/__tests__/api-devregistry.test.js +0 -56
  52. package/src/__tests__/api.test.ts +0 -80
  53. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  54. package/src/__tests__/config-cache.test.ts +0 -42
  55. package/src/__tests__/configuration.test.ts +0 -3981
  56. package/src/__tests__/d1.test.ts +0 -74
  57. package/src/__tests__/delete.test.ts +0 -230
  58. package/src/__tests__/deployments.test.ts +0 -91
  59. package/src/__tests__/dev.test.tsx +0 -1509
  60. package/src/__tests__/dialogs.test.tsx +0 -40
  61. package/src/__tests__/generate.test.ts +0 -235
  62. package/src/__tests__/get-host-from-url.test.ts +0 -16
  63. package/src/__tests__/guess-worker-format.test.ts +0 -85
  64. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  65. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  66. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  67. package/src/__tests__/helpers/mock-bin.ts +0 -36
  68. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  69. package/src/__tests__/helpers/mock-console.ts +0 -106
  70. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  71. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  72. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  73. package/src/__tests__/helpers/mock-istty.ts +0 -74
  74. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  75. package/src/__tests__/helpers/mock-kv.ts +0 -33
  76. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -252
  77. package/src/__tests__/helpers/mock-process.ts +0 -39
  78. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  79. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  80. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  81. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -59
  82. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  83. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -36
  84. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  85. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  86. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  87. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -22
  88. package/src/__tests__/helpers/msw/index.ts +0 -21
  89. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  90. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  91. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  92. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  93. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  94. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  95. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  96. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  97. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  98. package/src/__tests__/https-options.test.ts +0 -163
  99. package/src/__tests__/index.test.ts +0 -262
  100. package/src/__tests__/init.test.ts +0 -2900
  101. package/src/__tests__/jest.setup.ts +0 -202
  102. package/src/__tests__/kv.test.ts +0 -1675
  103. package/src/__tests__/logger.test.ts +0 -141
  104. package/src/__tests__/metrics.test.ts +0 -450
  105. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  106. package/src/__tests__/middleware.test.ts +0 -726
  107. package/src/__tests__/package-manager.test.ts +0 -353
  108. package/src/__tests__/pages.test.ts +0 -2387
  109. package/src/__tests__/parse.test.ts +0 -330
  110. package/src/__tests__/paths.test.ts +0 -39
  111. package/src/__tests__/publish.test.ts +0 -7633
  112. package/src/__tests__/pubsub.test.ts +0 -370
  113. package/src/__tests__/queues.test.ts +0 -371
  114. package/src/__tests__/r2.test.ts +0 -393
  115. package/src/__tests__/route.test.ts +0 -45
  116. package/src/__tests__/secret.test.ts +0 -644
  117. package/src/__tests__/tail.test.ts +0 -800
  118. package/src/__tests__/test-old-node-version.js +0 -31
  119. package/src/__tests__/type-generation.test.ts +0 -225
  120. package/src/__tests__/user.test.ts +0 -155
  121. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  122. package/src/__tests__/validate-dev-props.test.ts +0 -56
  123. package/src/__tests__/version.test.ts +0 -35
  124. package/src/__tests__/whoami.test.tsx +0 -278
  125. package/src/__tests__/worker-namespace.test.ts +0 -326
  126. package/src/abort.d.ts +0 -3
  127. package/src/api/dev.ts +0 -208
  128. package/src/api/index.ts +0 -2
  129. package/src/bundle-reporter.tsx +0 -68
  130. package/src/bundle.ts +0 -815
  131. package/src/cfetch/index.ts +0 -160
  132. package/src/cfetch/internal.ts +0 -263
  133. package/src/cli.ts +0 -28
  134. package/src/config/README.md +0 -107
  135. package/src/config/config.ts +0 -275
  136. package/src/config/diagnostics.ts +0 -80
  137. package/src/config/environment.ts +0 -561
  138. package/src/config/index.ts +0 -334
  139. package/src/config/validation-helpers.ts +0 -597
  140. package/src/config/validation.ts +0 -2103
  141. package/src/config-cache.ts +0 -85
  142. package/src/create-worker-preview.ts +0 -282
  143. package/src/create-worker-upload-form.ts +0 -316
  144. package/src/d1/backups.tsx +0 -218
  145. package/src/d1/constants.ts +0 -2
  146. package/src/d1/create.tsx +0 -63
  147. package/src/d1/delete.tsx +0 -56
  148. package/src/d1/execute.tsx +0 -344
  149. package/src/d1/formatTimeAgo.ts +0 -14
  150. package/src/d1/index.ts +0 -99
  151. package/src/d1/list.tsx +0 -48
  152. package/src/d1/migrations.tsx +0 -446
  153. package/src/d1/options.ts +0 -22
  154. package/src/d1/types.tsx +0 -24
  155. package/src/d1/utils.ts +0 -48
  156. package/src/delete.ts +0 -108
  157. package/src/deployments.ts +0 -77
  158. package/src/deprecated/index.ts +0 -438
  159. package/src/dev/dev-vars.ts +0 -39
  160. package/src/dev/dev.tsx +0 -587
  161. package/src/dev/get-local-persistence-path.tsx +0 -31
  162. package/src/dev/local.tsx +0 -746
  163. package/src/dev/remote.tsx +0 -603
  164. package/src/dev/start-server.ts +0 -519
  165. package/src/dev/use-esbuild.ts +0 -204
  166. package/src/dev/validate-dev-props.ts +0 -31
  167. package/src/dev-registry.tsx +0 -201
  168. package/src/dev.tsx +0 -868
  169. package/src/dialogs.tsx +0 -169
  170. package/src/dispatch-namespace.ts +0 -207
  171. package/src/durable.ts +0 -102
  172. package/src/entry.ts +0 -329
  173. package/src/environment-variables.ts +0 -50
  174. package/src/errors.ts +0 -11
  175. package/src/git-client.ts +0 -124
  176. package/src/global-wrangler-config-path.ts +0 -26
  177. package/src/https-options.ts +0 -127
  178. package/src/index.tsx +0 -683
  179. package/src/init.ts +0 -970
  180. package/src/inspect.ts +0 -767
  181. package/src/intl-polyfill.d.ts +0 -139
  182. package/src/is-ci.ts +0 -14
  183. package/src/is-interactive.ts +0 -16
  184. package/src/kv/helpers.ts +0 -430
  185. package/src/kv/index.ts +0 -596
  186. package/src/logger.ts +0 -92
  187. package/src/metrics/index.ts +0 -5
  188. package/src/metrics/metrics-config.ts +0 -239
  189. package/src/metrics/metrics-dispatcher.ts +0 -96
  190. package/src/metrics/metrics-usage-headers.ts +0 -24
  191. package/src/metrics/send-event.ts +0 -94
  192. package/src/miniflare-cli/README.md +0 -30
  193. package/src/miniflare-cli/assets.ts +0 -215
  194. package/src/miniflare-cli/index.ts +0 -213
  195. package/src/miniflare-cli/request-context.ts +0 -40
  196. package/src/module-collection.ts +0 -267
  197. package/src/open-in-browser.ts +0 -17
  198. package/src/package-manager.ts +0 -219
  199. package/src/pages/build.tsx +0 -270
  200. package/src/pages/constants.ts +0 -18
  201. package/src/pages/deployments.tsx +0 -106
  202. package/src/pages/dev.tsx +0 -708
  203. package/src/pages/errors.ts +0 -66
  204. package/src/pages/functions/buildPlugin.ts +0 -106
  205. package/src/pages/functions/buildWorker.ts +0 -165
  206. package/src/pages/functions/filepath-routing.test.ts +0 -234
  207. package/src/pages/functions/filepath-routing.ts +0 -189
  208. package/src/pages/functions/identifiers.ts +0 -78
  209. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  210. package/src/pages/functions/routes-consolidation.ts +0 -73
  211. package/src/pages/functions/routes-transformation.test.ts +0 -282
  212. package/src/pages/functions/routes-transformation.ts +0 -115
  213. package/src/pages/functions/routes-validation.test.ts +0 -403
  214. package/src/pages/functions/routes-validation.ts +0 -202
  215. package/src/pages/functions/routes.ts +0 -151
  216. package/src/pages/functions.tsx +0 -82
  217. package/src/pages/hash.tsx +0 -13
  218. package/src/pages/index.tsx +0 -94
  219. package/src/pages/projects.tsx +0 -169
  220. package/src/pages/publish.tsx +0 -446
  221. package/src/pages/types.ts +0 -49
  222. package/src/pages/upload.tsx +0 -425
  223. package/src/pages/utils.ts +0 -12
  224. package/src/parse.ts +0 -286
  225. package/src/paths.ts +0 -71
  226. package/src/proxy.ts +0 -689
  227. package/src/publish/index.ts +0 -270
  228. package/src/publish/publish.ts +0 -1035
  229. package/src/pubsub/index.ts +0 -286
  230. package/src/pubsub/pubsub-commands.tsx +0 -624
  231. package/src/queues/cli/commands/consumer/add.ts +0 -71
  232. package/src/queues/cli/commands/consumer/index.ts +0 -22
  233. package/src/queues/cli/commands/consumer/remove.ts +0 -38
  234. package/src/queues/cli/commands/create.ts +0 -25
  235. package/src/queues/cli/commands/delete.ts +0 -26
  236. package/src/queues/cli/commands/index.ts +0 -33
  237. package/src/queues/cli/commands/list.ts +0 -25
  238. package/src/queues/client.ts +0 -135
  239. package/src/r2/constants.ts +0 -4
  240. package/src/r2/helpers.ts +0 -131
  241. package/src/r2/index.ts +0 -289
  242. package/src/routes.ts +0 -140
  243. package/src/secret/index.ts +0 -378
  244. package/src/selfsigned.d.ts +0 -29
  245. package/src/sites.tsx +0 -372
  246. package/src/tail/createTail.ts +0 -315
  247. package/src/tail/filters.ts +0 -277
  248. package/src/tail/index.ts +0 -214
  249. package/src/tail/printing.ts +0 -107
  250. package/src/type-generation.ts +0 -173
  251. package/src/update-check.ts +0 -19
  252. package/src/user/access.ts +0 -69
  253. package/src/user/choose-account.tsx +0 -69
  254. package/src/user/env-vars.ts +0 -46
  255. package/src/user/generate-auth-url.ts +0 -33
  256. package/src/user/generate-random-state.ts +0 -16
  257. package/src/user/index.ts +0 -3
  258. package/src/user/user.tsx +0 -1192
  259. package/src/utils/collectKeyValues.ts +0 -14
  260. package/src/whoami.tsx +0 -169
  261. package/src/worker.ts +0 -245
  262. package/src/yargs-types.ts +0 -20
  263. package/src/zones.ts +0 -191
  264. package/templates/d1-beta-facade.js +0 -196
  265. package/templates/experimental-local-cache-stubs.js +0 -27
  266. package/templates/first-party-worker-module-facade.ts +0 -18
  267. package/templates/format-dev-errors.ts +0 -32
  268. package/templates/serve-static-assets.ts +0 -63
  269. package/templates/service-bindings-module-facade.js +0 -54
  270. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,425 +0,0 @@
1
- import { mkdir, readdir, readFile, stat, writeFile } from "node:fs/promises";
2
- import { dirname, join, relative, resolve, sep } from "node:path";
3
- import { render, Text } from "ink";
4
- import Spinner from "ink-spinner";
5
- import { getType } from "mime";
6
- import { Minimatch } from "minimatch";
7
- import PQueue from "p-queue";
8
- import prettyBytes from "pretty-bytes";
9
- import React from "react";
10
- import { fetchResult } from "../cfetch";
11
- import { FatalError } from "../errors";
12
- import isInteractive from "../is-interactive";
13
- import { logger } from "../logger";
14
- import {
15
- MAX_ASSET_COUNT,
16
- MAX_ASSET_SIZE,
17
- BULK_UPLOAD_CONCURRENCY,
18
- MAX_BUCKET_FILE_COUNT,
19
- MAX_BUCKET_SIZE,
20
- MAX_CHECK_MISSING_ATTEMPTS,
21
- MAX_UPLOAD_ATTEMPTS,
22
- } from "./constants";
23
- import { hashFile } from "./hash";
24
- import { pagesBetaWarning } from "./utils";
25
- import type { UploadPayloadFile, YargsOptionsToInterface } from "./types";
26
- import type { Argv } from "yargs";
27
-
28
- type UploadArgs = YargsOptionsToInterface<typeof Options>;
29
-
30
- export function Options(yargs: Argv) {
31
- return yargs
32
- .positional("directory", {
33
- type: "string",
34
- demandOption: true,
35
- description: "The directory of static files to upload",
36
- })
37
- .options({
38
- "output-manifest-path": {
39
- type: "string",
40
- description: "The name of the project you want to deploy to",
41
- },
42
- })
43
- .epilogue(pagesBetaWarning);
44
- }
45
-
46
- export const Handler = async ({
47
- directory,
48
- outputManifestPath,
49
- }: UploadArgs) => {
50
- if (!directory) {
51
- throw new FatalError("Must specify a directory.", 1);
52
- }
53
-
54
- if (!process.env.CF_PAGES_UPLOAD_JWT) {
55
- throw new FatalError("No JWT given.", 1);
56
- }
57
-
58
- const manifest = await upload({
59
- directory,
60
- jwt: process.env.CF_PAGES_UPLOAD_JWT,
61
- });
62
-
63
- if (outputManifestPath) {
64
- await mkdir(dirname(outputManifestPath), { recursive: true });
65
- await writeFile(outputManifestPath, JSON.stringify(manifest));
66
- }
67
-
68
- logger.log(`✨ Upload complete!`);
69
- };
70
-
71
- export const upload = async (
72
- args:
73
- | {
74
- directory: string;
75
- jwt: string;
76
- }
77
- | { directory: string; accountId: string; projectName: string }
78
- ) => {
79
- async function fetchJwt(): Promise<string> {
80
- if ("jwt" in args) {
81
- return args.jwt;
82
- } else {
83
- return (
84
- await fetchResult<{ jwt: string }>(
85
- `/accounts/${args.accountId}/pages/projects/${args.projectName}/upload-token`
86
- )
87
- ).jwt;
88
- }
89
- }
90
-
91
- type FileContainer = {
92
- path: string;
93
- contentType: string;
94
- sizeInBytes: number;
95
- hash: string;
96
- };
97
-
98
- const IGNORE_LIST = [
99
- "_worker.js",
100
- "_redirects",
101
- "_headers",
102
- "_routes.json",
103
- "functions",
104
- "**/.DS_Store",
105
- "**/node_modules",
106
- "**/.git",
107
- ].map((pattern) => new Minimatch(pattern));
108
-
109
- const directory = resolve(args.directory);
110
-
111
- // TODO(future): Use this to more efficiently load files in and speed up uploading
112
- // Limit memory to 1 GB unless more is specified
113
- // let maxMemory = 1_000_000_000;
114
- // if (process.env.NODE_OPTIONS && (process.env.NODE_OPTIONS.includes('--max-old-space-size=') || process.env.NODE_OPTIONS.includes('--max_old_space_size='))) {
115
- // const parsed = parser(process.env.NODE_OPTIONS);
116
- // maxMemory = (parsed['max-old-space-size'] ? parsed['max-old-space-size'] : parsed['max_old_space_size']) * 1000 * 1000; // Turn MB into bytes
117
- // }
118
-
119
- const walk = async (
120
- dir: string,
121
- fileMap: Map<string, FileContainer> = new Map(),
122
- startingDir: string = dir
123
- ) => {
124
- const files = await readdir(dir);
125
-
126
- await Promise.all(
127
- files.map(async (file) => {
128
- const filepath = join(dir, file);
129
- const relativeFilepath = relative(startingDir, filepath);
130
- const filestat = await stat(filepath);
131
-
132
- for (const minimatch of IGNORE_LIST) {
133
- if (minimatch.match(relativeFilepath)) {
134
- return;
135
- }
136
- }
137
-
138
- if (filestat.isSymbolicLink()) {
139
- return;
140
- }
141
-
142
- if (filestat.isDirectory()) {
143
- fileMap = await walk(filepath, fileMap, startingDir);
144
- } else {
145
- const name = relativeFilepath.split(sep).join("/");
146
-
147
- if (filestat.size > MAX_ASSET_SIZE) {
148
- throw new FatalError(
149
- `Error: Pages only supports files up to ${prettyBytes(
150
- MAX_ASSET_SIZE
151
- )} in size\n${name} is ${prettyBytes(filestat.size)} in size`,
152
- 1
153
- );
154
- }
155
-
156
- // We don't want to hold the content in memory. We instead only want to read it when it's needed
157
- fileMap.set(name, {
158
- path: filepath,
159
- contentType: getType(name) || "application/octet-stream",
160
- sizeInBytes: filestat.size,
161
- hash: hashFile(filepath),
162
- });
163
- }
164
- })
165
- );
166
-
167
- return fileMap;
168
- };
169
-
170
- const fileMap = await walk(directory);
171
-
172
- if (fileMap.size > MAX_ASSET_COUNT) {
173
- throw new FatalError(
174
- `Error: Pages only supports up to ${MAX_ASSET_COUNT.toLocaleString()} files in a deployment. Ensure you have specified your build output directory correctly.`,
175
- 1
176
- );
177
- }
178
-
179
- const files = [...fileMap.values()];
180
-
181
- let jwt = await fetchJwt();
182
-
183
- const start = Date.now();
184
-
185
- let attempts = 0;
186
- const getMissingHashes = async (): Promise<string[]> => {
187
- try {
188
- return await fetchResult<string[]>(`/pages/assets/check-missing`, {
189
- method: "POST",
190
- headers: {
191
- "Content-Type": "application/json",
192
- Authorization: `Bearer ${jwt}`,
193
- },
194
- body: JSON.stringify({
195
- hashes: files.map(({ hash }) => hash),
196
- }),
197
- });
198
- } catch (e) {
199
- if (attempts < MAX_CHECK_MISSING_ATTEMPTS) {
200
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
201
- await new Promise((resolvePromise) =>
202
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
203
- );
204
-
205
- if ((e as { code: number }).code === 8000013) {
206
- // Looks like the JWT expired, fetch another one
207
- jwt = await fetchJwt();
208
- }
209
- return getMissingHashes();
210
- } else {
211
- throw e;
212
- }
213
- }
214
- };
215
- const missingHashes = await getMissingHashes();
216
-
217
- const sortedFiles = files
218
- .filter((file) => missingHashes.includes(file.hash))
219
- .sort((a, b) => b.sizeInBytes - a.sizeInBytes);
220
-
221
- // Start with a few buckets so small projects still get
222
- // the benefit of multiple upload streams
223
- const buckets: {
224
- files: FileContainer[];
225
- remainingSize: number;
226
- }[] = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
227
- files: [],
228
- remainingSize: MAX_BUCKET_SIZE,
229
- }));
230
-
231
- let bucketOffset = 0;
232
- for (const file of sortedFiles) {
233
- let inserted = false;
234
-
235
- for (let i = 0; i < buckets.length; i++) {
236
- // Start at a different bucket for each new file
237
- const bucket = buckets[(i + bucketOffset) % buckets.length];
238
- if (
239
- bucket.remainingSize >= file.sizeInBytes &&
240
- bucket.files.length < MAX_BUCKET_FILE_COUNT
241
- ) {
242
- bucket.files.push(file);
243
- bucket.remainingSize -= file.sizeInBytes;
244
- inserted = true;
245
- break;
246
- }
247
- }
248
-
249
- if (!inserted) {
250
- buckets.push({
251
- files: [file],
252
- remainingSize: MAX_BUCKET_SIZE - file.sizeInBytes,
253
- });
254
- }
255
- bucketOffset++;
256
- }
257
-
258
- let counter = fileMap.size - sortedFiles.length;
259
- const { rerender, unmount } = render(
260
- <Progress done={counter} total={fileMap.size} />
261
- );
262
-
263
- const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
264
-
265
- for (const bucket of buckets) {
266
- // Don't upload empty buckets (can happen for tiny projects)
267
- if (bucket.files.length === 0) continue;
268
-
269
- attempts = 0;
270
- const doUpload = async (): Promise<void> => {
271
- // Populate the payload only when actually uploading (this is limited to 3 concurrent uploads at 50 MiB per bucket meaning we'd only load in a max of ~150 MiB)
272
- // This is so we don't run out of memory trying to upload the files.
273
- const payload: UploadPayloadFile[] = await Promise.all(
274
- bucket.files.map(async (file) => ({
275
- key: file.hash,
276
- value: (await readFile(file.path)).toString("base64"),
277
- metadata: {
278
- contentType: file.contentType,
279
- },
280
- base64: true,
281
- }))
282
- );
283
-
284
- try {
285
- return await fetchResult(`/pages/assets/upload`, {
286
- method: "POST",
287
- headers: {
288
- "Content-Type": "application/json",
289
- Authorization: `Bearer ${jwt}`,
290
- },
291
- body: JSON.stringify(payload),
292
- });
293
- } catch (e) {
294
- if (attempts < MAX_UPLOAD_ATTEMPTS) {
295
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
296
- await new Promise((resolvePromise) =>
297
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
298
- );
299
-
300
- if ((e as { code: number }).code === 8000013 || isJwtExpired(jwt)) {
301
- // Looks like the JWT expired, fetch another one
302
- jwt = await fetchJwt();
303
- }
304
- return doUpload();
305
- } else {
306
- throw e;
307
- }
308
- }
309
- };
310
-
311
- queue.add(() =>
312
- doUpload().then(
313
- () => {
314
- counter += bucket.files.length;
315
- rerender(<Progress done={counter} total={fileMap.size} />);
316
- },
317
- (error) => {
318
- return Promise.reject(
319
- new FatalError(
320
- `Failed to upload files. Please try again. Error: ${JSON.stringify(
321
- error
322
- )})`,
323
- error.code || 1
324
- )
325
- );
326
- }
327
- )
328
- );
329
- }
330
-
331
- await queue.onIdle();
332
-
333
- unmount();
334
-
335
- const uploadMs = Date.now() - start;
336
-
337
- const skipped = fileMap.size - missingHashes.length;
338
- const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
339
-
340
- logger.log(
341
- `✨ Success! Uploaded ${
342
- sortedFiles.length
343
- } files ${skippedMessage}${formatTime(uploadMs)}\n`
344
- );
345
-
346
- const doUpsertHashes = async (): Promise<void> => {
347
- try {
348
- return await fetchResult(`/pages/assets/upsert-hashes`, {
349
- method: "POST",
350
- headers: {
351
- "Content-Type": "application/json",
352
- Authorization: `Bearer ${jwt}`,
353
- },
354
- body: JSON.stringify({
355
- hashes: files.map(({ hash }) => hash),
356
- }),
357
- });
358
- } catch (e) {
359
- await new Promise((resolvePromise) => setTimeout(resolvePromise, 1000));
360
-
361
- if ((e as { code: number }).code === 8000013 || isJwtExpired(jwt)) {
362
- // Looks like the JWT expired, fetch another one
363
- jwt = await fetchJwt();
364
- }
365
-
366
- return await fetchResult(`/pages/assets/upsert-hashes`, {
367
- method: "POST",
368
- headers: {
369
- "Content-Type": "application/json",
370
- Authorization: `Bearer ${jwt}`,
371
- },
372
- body: JSON.stringify({
373
- hashes: files.map(({ hash }) => hash),
374
- }),
375
- });
376
- }
377
- };
378
-
379
- try {
380
- await doUpsertHashes();
381
- } catch {
382
- logger.warn(
383
- "Failed to update file hashes. Every upload appeared to succeed for this deployment, but you might need to re-upload for future deployments. This shouldn't have any impact other than slowing the upload speed of your next deployment."
384
- );
385
- }
386
-
387
- return Object.fromEntries(
388
- [...fileMap.entries()].map(([fileName, file]) => [
389
- `/${fileName}`,
390
- file.hash,
391
- ])
392
- );
393
- };
394
-
395
- // Decode and check that the current JWT has not expired
396
- function isJwtExpired(token: string): boolean | undefined {
397
- try {
398
- const decodedJwt = JSON.parse(
399
- Buffer.from(token.split(".")[1], "base64").toString()
400
- );
401
-
402
- const dateNow = new Date().getTime() / 1000;
403
-
404
- return decodedJwt.exp <= dateNow;
405
- } catch (e) {
406
- if (e instanceof Error) {
407
- throw new Error(`Invalid token: ${e.message}`);
408
- }
409
- }
410
- }
411
-
412
- function formatTime(duration: number) {
413
- return `(${(duration / 1000).toFixed(2)} sec)`;
414
- }
415
-
416
- function Progress({ done, total }: { done: number; total: number }) {
417
- return (
418
- <>
419
- <Text>
420
- {isInteractive() ? <Spinner type="earth" /> : null}
421
- {` Uploading... (${done}/${total})\n`}
422
- </Text>
423
- </>
424
- );
425
- }
@@ -1,12 +0,0 @@
1
- import type { BundleResult } from "../bundle";
2
-
3
- export const RUNNING_BUILDERS: BundleResult[] = [];
4
-
5
- export const CLEANUP_CALLBACKS: (() => void)[] = [];
6
- export const CLEANUP = () => {
7
- CLEANUP_CALLBACKS.forEach((callback) => callback());
8
- RUNNING_BUILDERS.forEach((builder) => builder.stop?.());
9
- };
10
-
11
- export const pagesBetaWarning =
12
- "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";
package/src/parse.ts DELETED
@@ -1,286 +0,0 @@
1
- import * as fs from "node:fs";
2
- import { resolve } from "node:path";
3
- import TOML from "@iarna/toml";
4
- import { formatMessagesSync } from "esbuild";
5
- import { logger } from "./logger";
6
-
7
- export type Message = {
8
- text: string;
9
- location?: Location;
10
- notes?: Message[];
11
- kind?: "warning" | "error";
12
- };
13
-
14
- export type Location = File & {
15
- line: number;
16
- column: number;
17
- length?: number;
18
- lineText?: string;
19
- suggestion?: string;
20
- };
21
-
22
- export type File = {
23
- file?: string;
24
- fileText?: string;
25
- };
26
-
27
- /**
28
- * Formats a `Message` using esbuild's pretty-printing algorithm.
29
- */
30
- export function formatMessage(
31
- { text, notes, location, kind = "error" }: Message,
32
- color = true
33
- ): string {
34
- const input = { text, notes, location };
35
- delete input.location?.fileText;
36
- for (const note of notes ?? []) {
37
- delete note.location?.fileText;
38
- }
39
- const lines = formatMessagesSync([input], {
40
- color,
41
- kind: kind,
42
- terminalWidth: logger.columns,
43
- });
44
- return lines.join("\n");
45
- }
46
-
47
- /**
48
- * An error that's thrown when something fails to parse.
49
- */
50
- export class ParseError extends Error implements Message {
51
- readonly text: string;
52
- readonly notes: Message[];
53
- readonly location?: Location;
54
- readonly kind: "warning" | "error";
55
-
56
- constructor({ text, notes, location, kind }: Message) {
57
- super(text);
58
- this.name = this.constructor.name;
59
- this.text = text;
60
- this.notes = notes ?? [];
61
- this.location = location;
62
- this.kind = kind ?? "error";
63
- }
64
- }
65
-
66
- const TOML_ERROR_NAME = "TomlError";
67
- const TOML_ERROR_SUFFIX = " at row ";
68
-
69
- type TomlError = Error & {
70
- line: number;
71
- col: number;
72
- };
73
-
74
- /**
75
- * A wrapper around `TOML.parse` that throws a `ParseError`.
76
- */
77
- export function parseTOML(input: string, file?: string): TOML.JsonMap | never {
78
- try {
79
- // Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
80
- const normalizedInput = input.replace(/\r\n/g, "\n");
81
- return TOML.parse(normalizedInput);
82
- } catch (err) {
83
- const { name, message, line, col } = err as TomlError;
84
- if (name !== TOML_ERROR_NAME) {
85
- throw err;
86
- }
87
- const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
88
- const lineText = input.split("\n")[line];
89
- const location = {
90
- lineText,
91
- line: line + 1,
92
- column: col - 1,
93
- file,
94
- fileText: input,
95
- };
96
- throw new ParseError({ text, location });
97
- }
98
- }
99
-
100
- const JSON_ERROR_SUFFIX = " in JSON at position ";
101
-
102
- /**
103
- * A minimal type describing a package.json file.
104
- */
105
- export type PackageJSON = {
106
- devDependencies?: Record<string, unknown>;
107
- dependencies?: Record<string, unknown>;
108
- scripts?: Record<string, unknown>;
109
- };
110
-
111
- /**
112
- * A typed version of `parseJSON()`.
113
- */
114
- export function parsePackageJSON<T extends PackageJSON = PackageJSON>(
115
- input: string,
116
- file?: string
117
- ): T {
118
- return parseJSON<T>(input, file);
119
- }
120
-
121
- /**
122
- * A wrapper around `JSON.parse` that throws a `ParseError`.
123
- */
124
- export function parseJSON<T>(input: string, file?: string): T {
125
- try {
126
- return JSON.parse(input);
127
- } catch (err) {
128
- const { message } = err as Error;
129
- const index = message.lastIndexOf(JSON_ERROR_SUFFIX);
130
- if (index < 0) {
131
- throw err;
132
- }
133
- const text = message.substring(0, index);
134
- const position = parseInt(
135
- message.substring(index + JSON_ERROR_SUFFIX.length)
136
- );
137
- const location = indexLocation({ file, fileText: input }, position);
138
- throw new ParseError({ text, location });
139
- }
140
- }
141
-
142
- /**
143
- * Reads a file into a node Buffer.
144
- */
145
- export function readFileSyncToBuffer(file: string): Buffer {
146
- try {
147
- return fs.readFileSync(file);
148
- } catch (err) {
149
- const { message } = err as Error;
150
- throw new ParseError({
151
- text: `Could not read file: ${file}`,
152
- notes: [
153
- {
154
- text: message.replace(file, resolve(file)),
155
- },
156
- ],
157
- });
158
- }
159
- }
160
-
161
- /**
162
- * Reads a file and parses it based on its type.
163
- */
164
- export function readFileSync(file: string): string {
165
- try {
166
- return fs.readFileSync(file, { encoding: "utf-8" });
167
- } catch (err) {
168
- const { message } = err as Error;
169
- throw new ParseError({
170
- text: `Could not read file: ${file}`,
171
- notes: [
172
- {
173
- text: message.replace(file, resolve(file)),
174
- },
175
- ],
176
- });
177
- }
178
- }
179
-
180
- /**
181
- * Calculates the line and column location from an index.
182
- */
183
- export function indexLocation(file: File, index: number): Location {
184
- let lineText,
185
- line = 0,
186
- column = 0,
187
- cursor = 0;
188
- const { fileText = "" } = file;
189
- for (const row of fileText.split("\n")) {
190
- line++;
191
- cursor += row.length + 1;
192
- if (cursor >= index) {
193
- lineText = row;
194
- column = row.length - (cursor - index);
195
- break;
196
- }
197
- }
198
- return { lineText, line, column, ...file };
199
- }
200
-
201
- /**
202
- * Guesses the line and column location of a search query.
203
- */
204
- export function searchLocation(file: File, query: unknown): Location {
205
- let lineText,
206
- length,
207
- line = 0,
208
- column = 0;
209
- const queryText = String(query);
210
- const { fileText = "" } = file;
211
- for (const content of fileText.split("\n")) {
212
- line++;
213
- const index = content.indexOf(queryText);
214
- if (index >= 0) {
215
- lineText = content;
216
- column = index;
217
- length = queryText.length;
218
- break;
219
- }
220
- }
221
- return { lineText, line, column, length, ...file };
222
- }
223
-
224
- const units = {
225
- nanoseconds: 0.000000001,
226
- nanosecond: 0.000000001,
227
- microseconds: 0.000001,
228
- microsecond: 0.000001,
229
- milliseconds: 0.001,
230
- millisecond: 0.001,
231
- seconds: 1,
232
- second: 1,
233
- minutes: 60,
234
- minute: 60,
235
- hours: 3600,
236
- hour: 3600,
237
- days: 86400,
238
- day: 86400,
239
- weeks: 604800,
240
- week: 604800,
241
- month: 18144000,
242
- year: 220752000,
243
-
244
- nsecs: 0.000000001,
245
- nsec: 0.000000001,
246
- usecs: 0.000001,
247
- usec: 0.000001,
248
- msecs: 0.001,
249
- msec: 0.001,
250
- secs: 1,
251
- sec: 1,
252
- mins: 60,
253
- min: 60,
254
-
255
- ns: 0.000000001,
256
- us: 0.000001,
257
- ms: 0.001,
258
- mo: 18144000,
259
- yr: 220752000,
260
-
261
- s: 1,
262
- m: 60,
263
- h: 3600,
264
- d: 86400,
265
- w: 604800,
266
- y: 220752000,
267
- };
268
-
269
- /**
270
- * Parse a human-readable time duration in seconds (including fractional)
271
- *
272
- * Invalid values will return NaN
273
- */
274
- export function parseHumanDuration(s: string): number {
275
- const unitsMap = new Map(Object.entries(units));
276
- s = s.trim().toLowerCase();
277
- let base = 1;
278
- for (const [name, _] of unitsMap) {
279
- if (s.endsWith(name)) {
280
- s = s.substring(0, s.length - name.length);
281
- base = unitsMap.get(name) || 1;
282
- break;
283
- }
284
- }
285
- return Number(s) * base;
286
- }