wrangler 0.0.0-e4047cab → 0.0.0-e4104915

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 (276) hide show
  1. package/README.md +12 -14
  2. package/bin/wrangler.js +14 -67
  3. package/package.json +213 -192
  4. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  5. package/templates/__tests__/tsconfig.json +8 -0
  6. package/templates/checked-fetch.js +19 -6
  7. package/templates/facade.d.ts +17 -0
  8. package/templates/gitignore +1 -0
  9. package/templates/init-tests/test-jest-new-worker.js +3 -5
  10. package/templates/init-tests/test-vitest-new-worker.js +3 -5
  11. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  12. package/templates/middleware/common.ts +9 -4
  13. package/templates/middleware/loader-modules.ts +64 -11
  14. package/templates/middleware/loader-sw.ts +2 -1
  15. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  16. package/templates/middleware/middleware-miniflare3-json-error.ts +18 -5
  17. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  18. package/templates/middleware/middleware-multiworker-dev.ts +68 -0
  19. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  20. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  21. package/templates/modules-watch-stub.js +4 -0
  22. package/templates/new-worker-scheduled.ts +1 -1
  23. package/templates/new-worker.ts +4 -1
  24. package/templates/pages-dev-pipeline.ts +4 -1
  25. package/templates/pages-dev-util.ts +4 -1
  26. package/templates/pages-shim.ts +1 -1
  27. package/templates/pages-template-plugin.ts +31 -12
  28. package/templates/pages-template-worker.ts +11 -2
  29. package/templates/startDevWorker/InspectorProxyWorker.ts +652 -0
  30. package/templates/startDevWorker/ProxyWorker.ts +252 -0
  31. package/templates/tsconfig-sanity.ts +11 -0
  32. package/templates/tsconfig.init.json +105 -0
  33. package/templates/tsconfig.json +5 -103
  34. package/wrangler-dist/InspectorProxyWorker.js +460 -0
  35. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  36. package/wrangler-dist/ProxyWorker.js +186 -0
  37. package/wrangler-dist/ProxyWorker.js.map +6 -0
  38. package/wrangler-dist/cli.d.ts +23076 -462
  39. package/wrangler-dist/cli.js +134460 -136904
  40. package/wrangler-dist/wasm-sync.wasm +0 -0
  41. package/import_meta_url.js +0 -3
  42. package/miniflare-config-stubs/.env.empty +0 -0
  43. package/miniflare-config-stubs/package.empty.json +0 -1
  44. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  45. package/miniflare-dist/index.mjs +0 -6321
  46. package/src/__tests__/access.test.ts +0 -25
  47. package/src/__tests__/api-dev.test.ts +0 -209
  48. package/src/__tests__/api-devregistry.test.js +0 -56
  49. package/src/__tests__/api.test.ts +0 -80
  50. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  51. package/src/__tests__/config-cache.test.ts +0 -42
  52. package/src/__tests__/configuration.test.ts +0 -3981
  53. package/src/__tests__/d1.test.ts +0 -80
  54. package/src/__tests__/delete.test.ts +0 -263
  55. package/src/__tests__/deployments.test.ts +0 -91
  56. package/src/__tests__/dev.test.tsx +0 -1536
  57. package/src/__tests__/dialogs.test.tsx +0 -40
  58. package/src/__tests__/generate.test.ts +0 -235
  59. package/src/__tests__/get-host-from-url.test.ts +0 -16
  60. package/src/__tests__/guess-worker-format.test.ts +0 -85
  61. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  62. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  63. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  64. package/src/__tests__/helpers/mock-bin.ts +0 -36
  65. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  66. package/src/__tests__/helpers/mock-console.ts +0 -106
  67. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  68. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  69. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  70. package/src/__tests__/helpers/mock-istty.ts +0 -74
  71. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  72. package/src/__tests__/helpers/mock-kv.ts +0 -33
  73. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -256
  74. package/src/__tests__/helpers/mock-process.ts +0 -39
  75. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  76. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  77. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  78. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -59
  79. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  80. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  81. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  82. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  83. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  84. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -22
  85. package/src/__tests__/helpers/msw/index.ts +0 -21
  86. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  87. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  88. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  89. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  90. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  91. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  92. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  93. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  94. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  95. package/src/__tests__/https-options.test.ts +0 -163
  96. package/src/__tests__/index.test.ts +0 -264
  97. package/src/__tests__/init.test.ts +0 -2900
  98. package/src/__tests__/jest.setup.ts +0 -202
  99. package/src/__tests__/kv.test.ts +0 -1675
  100. package/src/__tests__/logger.test.ts +0 -141
  101. package/src/__tests__/logout.test.ts +0 -47
  102. package/src/__tests__/metrics.test.ts +0 -450
  103. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  104. package/src/__tests__/middleware.test.ts +0 -726
  105. package/src/__tests__/package-manager.test.ts +0 -353
  106. package/src/__tests__/pages-deployment-tail.test.ts +0 -820
  107. package/src/__tests__/pages.test.ts +0 -2442
  108. package/src/__tests__/parse.test.ts +0 -330
  109. package/src/__tests__/paths.test.ts +0 -39
  110. package/src/__tests__/publish.test.ts +0 -7633
  111. package/src/__tests__/pubsub.test.ts +0 -370
  112. package/src/__tests__/queues.test.ts +0 -522
  113. package/src/__tests__/r2.test.ts +0 -393
  114. package/src/__tests__/route.test.ts +0 -45
  115. package/src/__tests__/secret.test.ts +0 -644
  116. package/src/__tests__/tail.test.ts +0 -899
  117. package/src/__tests__/test-old-node-version.js +0 -31
  118. package/src/__tests__/type-generation.test.ts +0 -226
  119. package/src/__tests__/user.test.ts +0 -129
  120. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  121. package/src/__tests__/validate-dev-props.test.ts +0 -56
  122. package/src/__tests__/version.test.ts +0 -35
  123. package/src/__tests__/whoami.test.tsx +0 -278
  124. package/src/__tests__/worker-namespace.test.ts +0 -326
  125. package/src/abort.d.ts +0 -3
  126. package/src/api/dev.ts +0 -210
  127. package/src/api/index.ts +0 -2
  128. package/src/bundle-reporter.tsx +0 -68
  129. package/src/bundle.ts +0 -823
  130. package/src/cfetch/index.ts +0 -160
  131. package/src/cfetch/internal.ts +0 -263
  132. package/src/cli.ts +0 -28
  133. package/src/config/README.md +0 -107
  134. package/src/config/config.ts +0 -275
  135. package/src/config/diagnostics.ts +0 -80
  136. package/src/config/environment.ts +0 -561
  137. package/src/config/index.ts +0 -334
  138. package/src/config/validation-helpers.ts +0 -597
  139. package/src/config/validation.ts +0 -2103
  140. package/src/config-cache.ts +0 -85
  141. package/src/create-worker-preview.ts +0 -282
  142. package/src/create-worker-upload-form.ts +0 -316
  143. package/src/d1/backups.tsx +0 -223
  144. package/src/d1/constants.ts +0 -2
  145. package/src/d1/create.tsx +0 -63
  146. package/src/d1/delete.tsx +0 -56
  147. package/src/d1/execute.tsx +0 -352
  148. package/src/d1/formatTimeAgo.ts +0 -14
  149. package/src/d1/index.ts +0 -101
  150. package/src/d1/list.tsx +0 -48
  151. package/src/d1/migrations/apply.tsx +0 -184
  152. package/src/d1/migrations/create.tsx +0 -77
  153. package/src/d1/migrations/helpers.ts +0 -147
  154. package/src/d1/migrations/index.tsx +0 -3
  155. package/src/d1/migrations/list.tsx +0 -79
  156. package/src/d1/migrations/options.ts +0 -18
  157. package/src/d1/options.ts +0 -22
  158. package/src/d1/types.tsx +0 -24
  159. package/src/d1/utils.ts +0 -48
  160. package/src/delete.ts +0 -108
  161. package/src/deployments.ts +0 -77
  162. package/src/deprecated/index.ts +0 -438
  163. package/src/dev/dev-vars.ts +0 -39
  164. package/src/dev/dev.tsx +0 -614
  165. package/src/dev/get-local-persistence-path.tsx +0 -31
  166. package/src/dev/local.tsx +0 -890
  167. package/src/dev/remote.tsx +0 -603
  168. package/src/dev/start-server.ts +0 -539
  169. package/src/dev/use-esbuild.ts +0 -204
  170. package/src/dev/validate-dev-props.ts +0 -31
  171. package/src/dev-registry.tsx +0 -201
  172. package/src/dev.tsx +0 -904
  173. package/src/dialogs.tsx +0 -168
  174. package/src/dispatch-namespace.ts +0 -207
  175. package/src/durable.ts +0 -102
  176. package/src/entry.ts +0 -329
  177. package/src/environment-variables.ts +0 -50
  178. package/src/errors.ts +0 -11
  179. package/src/git-client.ts +0 -124
  180. package/src/global-wrangler-config-path.ts +0 -26
  181. package/src/https-options.ts +0 -127
  182. package/src/index.tsx +0 -687
  183. package/src/init.ts +0 -970
  184. package/src/inspect.ts +0 -767
  185. package/src/intl-polyfill.d.ts +0 -139
  186. package/src/is-ci.ts +0 -14
  187. package/src/is-interactive.ts +0 -16
  188. package/src/kv/helpers.ts +0 -430
  189. package/src/kv/index.ts +0 -596
  190. package/src/logger.ts +0 -92
  191. package/src/metrics/index.ts +0 -5
  192. package/src/metrics/metrics-config.ts +0 -239
  193. package/src/metrics/metrics-dispatcher.ts +0 -96
  194. package/src/metrics/metrics-usage-headers.ts +0 -24
  195. package/src/metrics/send-event.ts +0 -96
  196. package/src/miniflare-cli/README.md +0 -30
  197. package/src/miniflare-cli/assets.ts +0 -220
  198. package/src/miniflare-cli/index.ts +0 -213
  199. package/src/miniflare-cli/request-context.ts +0 -40
  200. package/src/module-collection.ts +0 -267
  201. package/src/open-in-browser.ts +0 -17
  202. package/src/package-manager.ts +0 -219
  203. package/src/pages/build.tsx +0 -270
  204. package/src/pages/constants.ts +0 -18
  205. package/src/pages/deployment-tails.tsx +0 -284
  206. package/src/pages/deployments.tsx +0 -84
  207. package/src/pages/dev.tsx +0 -706
  208. package/src/pages/errors.ts +0 -66
  209. package/src/pages/functions/buildPlugin.ts +0 -107
  210. package/src/pages/functions/buildWorker.ts +0 -166
  211. package/src/pages/functions/filepath-routing.test.ts +0 -234
  212. package/src/pages/functions/filepath-routing.ts +0 -189
  213. package/src/pages/functions/identifiers.ts +0 -78
  214. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  215. package/src/pages/functions/routes-consolidation.ts +0 -73
  216. package/src/pages/functions/routes-transformation.test.ts +0 -282
  217. package/src/pages/functions/routes-transformation.ts +0 -115
  218. package/src/pages/functions/routes-validation.test.ts +0 -403
  219. package/src/pages/functions/routes-validation.ts +0 -202
  220. package/src/pages/functions/routes.ts +0 -151
  221. package/src/pages/functions.tsx +0 -82
  222. package/src/pages/hash.tsx +0 -13
  223. package/src/pages/index.tsx +0 -102
  224. package/src/pages/projects.tsx +0 -169
  225. package/src/pages/prompt-select-project.tsx +0 -31
  226. package/src/pages/publish.tsx +0 -451
  227. package/src/pages/types.ts +0 -41
  228. package/src/pages/upload.tsx +0 -426
  229. package/src/pages/utils.ts +0 -23
  230. package/src/parse.ts +0 -286
  231. package/src/paths.ts +0 -71
  232. package/src/proxy.ts +0 -694
  233. package/src/publish/index.ts +0 -270
  234. package/src/publish/publish.ts +0 -1035
  235. package/src/pubsub/index.ts +0 -286
  236. package/src/pubsub/pubsub-commands.tsx +0 -624
  237. package/src/queues/cli/commands/consumer/add.ts +0 -71
  238. package/src/queues/cli/commands/consumer/index.ts +0 -22
  239. package/src/queues/cli/commands/consumer/remove.ts +0 -38
  240. package/src/queues/cli/commands/create.ts +0 -25
  241. package/src/queues/cli/commands/delete.ts +0 -26
  242. package/src/queues/cli/commands/index.ts +0 -36
  243. package/src/queues/cli/commands/list.ts +0 -25
  244. package/src/queues/client.ts +0 -135
  245. package/src/queues/utils.ts +0 -18
  246. package/src/r2/constants.ts +0 -4
  247. package/src/r2/helpers.ts +0 -131
  248. package/src/r2/index.ts +0 -289
  249. package/src/routes.ts +0 -140
  250. package/src/secret/index.ts +0 -378
  251. package/src/selfsigned.d.ts +0 -29
  252. package/src/sites.tsx +0 -372
  253. package/src/tail/createTail.ts +0 -379
  254. package/src/tail/filters.ts +0 -277
  255. package/src/tail/index.ts +0 -214
  256. package/src/tail/printing.ts +0 -107
  257. package/src/type-generation.ts +0 -173
  258. package/src/update-check.ts +0 -19
  259. package/src/user/access.ts +0 -69
  260. package/src/user/choose-account.tsx +0 -69
  261. package/src/user/env-vars.ts +0 -46
  262. package/src/user/generate-auth-url.ts +0 -33
  263. package/src/user/generate-random-state.ts +0 -16
  264. package/src/user/index.ts +0 -3
  265. package/src/user/user.tsx +0 -1198
  266. package/src/utils/collectKeyValues.ts +0 -14
  267. package/src/whoami.tsx +0 -169
  268. package/src/worker.ts +0 -245
  269. package/src/yargs-types.ts +0 -24
  270. package/src/zones.ts +0 -191
  271. package/templates/d1-beta-facade.js +0 -205
  272. package/templates/first-party-worker-module-facade.ts +0 -18
  273. package/templates/format-dev-errors.ts +0 -32
  274. package/templates/serve-static-assets.ts +0 -63
  275. package/templates/service-bindings-module-facade.js +0 -54
  276. package/templates/service-bindings-sw-facade.js +0 -42
@@ -1,426 +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 { YargsOptionsToInterface } from "../yargs-types";
26
- import type { UploadPayloadFile } from "./types";
27
- import type { Argv } from "yargs";
28
-
29
- type UploadArgs = YargsOptionsToInterface<typeof Options>;
30
-
31
- export function Options(yargs: Argv) {
32
- return yargs
33
- .positional("directory", {
34
- type: "string",
35
- demandOption: true,
36
- description: "The directory of static files to upload",
37
- })
38
- .options({
39
- "output-manifest-path": {
40
- type: "string",
41
- description: "The name of the project you want to deploy to",
42
- },
43
- })
44
- .epilogue(pagesBetaWarning);
45
- }
46
-
47
- export const Handler = async ({
48
- directory,
49
- outputManifestPath,
50
- }: UploadArgs) => {
51
- if (!directory) {
52
- throw new FatalError("Must specify a directory.", 1);
53
- }
54
-
55
- if (!process.env.CF_PAGES_UPLOAD_JWT) {
56
- throw new FatalError("No JWT given.", 1);
57
- }
58
-
59
- const manifest = await upload({
60
- directory,
61
- jwt: process.env.CF_PAGES_UPLOAD_JWT,
62
- });
63
-
64
- if (outputManifestPath) {
65
- await mkdir(dirname(outputManifestPath), { recursive: true });
66
- await writeFile(outputManifestPath, JSON.stringify(manifest));
67
- }
68
-
69
- logger.log(`✨ Upload complete!`);
70
- };
71
-
72
- export const upload = async (
73
- args:
74
- | {
75
- directory: string;
76
- jwt: string;
77
- }
78
- | { directory: string; accountId: string; projectName: string }
79
- ) => {
80
- async function fetchJwt(): Promise<string> {
81
- if ("jwt" in args) {
82
- return args.jwt;
83
- } else {
84
- return (
85
- await fetchResult<{ jwt: string }>(
86
- `/accounts/${args.accountId}/pages/projects/${args.projectName}/upload-token`
87
- )
88
- ).jwt;
89
- }
90
- }
91
-
92
- type FileContainer = {
93
- path: string;
94
- contentType: string;
95
- sizeInBytes: number;
96
- hash: string;
97
- };
98
-
99
- const IGNORE_LIST = [
100
- "_worker.js",
101
- "_redirects",
102
- "_headers",
103
- "_routes.json",
104
- "functions",
105
- "**/.DS_Store",
106
- "**/node_modules",
107
- "**/.git",
108
- ].map((pattern) => new Minimatch(pattern));
109
-
110
- const directory = resolve(args.directory);
111
-
112
- // TODO(future): Use this to more efficiently load files in and speed up uploading
113
- // Limit memory to 1 GB unless more is specified
114
- // let maxMemory = 1_000_000_000;
115
- // if (process.env.NODE_OPTIONS && (process.env.NODE_OPTIONS.includes('--max-old-space-size=') || process.env.NODE_OPTIONS.includes('--max_old_space_size='))) {
116
- // const parsed = parser(process.env.NODE_OPTIONS);
117
- // maxMemory = (parsed['max-old-space-size'] ? parsed['max-old-space-size'] : parsed['max_old_space_size']) * 1000 * 1000; // Turn MB into bytes
118
- // }
119
-
120
- const walk = async (
121
- dir: string,
122
- fileMap: Map<string, FileContainer> = new Map(),
123
- startingDir: string = dir
124
- ) => {
125
- const files = await readdir(dir);
126
-
127
- await Promise.all(
128
- files.map(async (file) => {
129
- const filepath = join(dir, file);
130
- const relativeFilepath = relative(startingDir, filepath);
131
- const filestat = await stat(filepath);
132
-
133
- for (const minimatch of IGNORE_LIST) {
134
- if (minimatch.match(relativeFilepath)) {
135
- return;
136
- }
137
- }
138
-
139
- if (filestat.isSymbolicLink()) {
140
- return;
141
- }
142
-
143
- if (filestat.isDirectory()) {
144
- fileMap = await walk(filepath, fileMap, startingDir);
145
- } else {
146
- const name = relativeFilepath.split(sep).join("/");
147
-
148
- if (filestat.size > MAX_ASSET_SIZE) {
149
- throw new FatalError(
150
- `Error: Pages only supports files up to ${prettyBytes(
151
- MAX_ASSET_SIZE
152
- )} in size\n${name} is ${prettyBytes(filestat.size)} in size`,
153
- 1
154
- );
155
- }
156
-
157
- // We don't want to hold the content in memory. We instead only want to read it when it's needed
158
- fileMap.set(name, {
159
- path: filepath,
160
- contentType: getType(name) || "application/octet-stream",
161
- sizeInBytes: filestat.size,
162
- hash: hashFile(filepath),
163
- });
164
- }
165
- })
166
- );
167
-
168
- return fileMap;
169
- };
170
-
171
- const fileMap = await walk(directory);
172
-
173
- if (fileMap.size > MAX_ASSET_COUNT) {
174
- throw new FatalError(
175
- `Error: Pages only supports up to ${MAX_ASSET_COUNT.toLocaleString()} files in a deployment. Ensure you have specified your build output directory correctly.`,
176
- 1
177
- );
178
- }
179
-
180
- const files = [...fileMap.values()];
181
-
182
- let jwt = await fetchJwt();
183
-
184
- const start = Date.now();
185
-
186
- let attempts = 0;
187
- const getMissingHashes = async (): Promise<string[]> => {
188
- try {
189
- return await fetchResult<string[]>(`/pages/assets/check-missing`, {
190
- method: "POST",
191
- headers: {
192
- "Content-Type": "application/json",
193
- Authorization: `Bearer ${jwt}`,
194
- },
195
- body: JSON.stringify({
196
- hashes: files.map(({ hash }) => hash),
197
- }),
198
- });
199
- } catch (e) {
200
- if (attempts < MAX_CHECK_MISSING_ATTEMPTS) {
201
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
202
- await new Promise((resolvePromise) =>
203
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
204
- );
205
-
206
- if ((e as { code: number }).code === 8000013) {
207
- // Looks like the JWT expired, fetch another one
208
- jwt = await fetchJwt();
209
- }
210
- return getMissingHashes();
211
- } else {
212
- throw e;
213
- }
214
- }
215
- };
216
- const missingHashes = await getMissingHashes();
217
-
218
- const sortedFiles = files
219
- .filter((file) => missingHashes.includes(file.hash))
220
- .sort((a, b) => b.sizeInBytes - a.sizeInBytes);
221
-
222
- // Start with a few buckets so small projects still get
223
- // the benefit of multiple upload streams
224
- const buckets: {
225
- files: FileContainer[];
226
- remainingSize: number;
227
- }[] = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
228
- files: [],
229
- remainingSize: MAX_BUCKET_SIZE,
230
- }));
231
-
232
- let bucketOffset = 0;
233
- for (const file of sortedFiles) {
234
- let inserted = false;
235
-
236
- for (let i = 0; i < buckets.length; i++) {
237
- // Start at a different bucket for each new file
238
- const bucket = buckets[(i + bucketOffset) % buckets.length];
239
- if (
240
- bucket.remainingSize >= file.sizeInBytes &&
241
- bucket.files.length < MAX_BUCKET_FILE_COUNT
242
- ) {
243
- bucket.files.push(file);
244
- bucket.remainingSize -= file.sizeInBytes;
245
- inserted = true;
246
- break;
247
- }
248
- }
249
-
250
- if (!inserted) {
251
- buckets.push({
252
- files: [file],
253
- remainingSize: MAX_BUCKET_SIZE - file.sizeInBytes,
254
- });
255
- }
256
- bucketOffset++;
257
- }
258
-
259
- let counter = fileMap.size - sortedFiles.length;
260
- const { rerender, unmount } = render(
261
- <Progress done={counter} total={fileMap.size} />
262
- );
263
-
264
- const queue = new PQueue({ concurrency: BULK_UPLOAD_CONCURRENCY });
265
-
266
- for (const bucket of buckets) {
267
- // Don't upload empty buckets (can happen for tiny projects)
268
- if (bucket.files.length === 0) continue;
269
-
270
- attempts = 0;
271
- const doUpload = async (): Promise<void> => {
272
- // 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)
273
- // This is so we don't run out of memory trying to upload the files.
274
- const payload: UploadPayloadFile[] = await Promise.all(
275
- bucket.files.map(async (file) => ({
276
- key: file.hash,
277
- value: (await readFile(file.path)).toString("base64"),
278
- metadata: {
279
- contentType: file.contentType,
280
- },
281
- base64: true,
282
- }))
283
- );
284
-
285
- try {
286
- return await fetchResult(`/pages/assets/upload`, {
287
- method: "POST",
288
- headers: {
289
- "Content-Type": "application/json",
290
- Authorization: `Bearer ${jwt}`,
291
- },
292
- body: JSON.stringify(payload),
293
- });
294
- } catch (e) {
295
- if (attempts < MAX_UPLOAD_ATTEMPTS) {
296
- // Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
297
- await new Promise((resolvePromise) =>
298
- setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
299
- );
300
-
301
- if ((e as { code: number }).code === 8000013 || isJwtExpired(jwt)) {
302
- // Looks like the JWT expired, fetch another one
303
- jwt = await fetchJwt();
304
- }
305
- return doUpload();
306
- } else {
307
- throw e;
308
- }
309
- }
310
- };
311
-
312
- queue.add(() =>
313
- doUpload().then(
314
- () => {
315
- counter += bucket.files.length;
316
- rerender(<Progress done={counter} total={fileMap.size} />);
317
- },
318
- (error) => {
319
- return Promise.reject(
320
- new FatalError(
321
- `Failed to upload files. Please try again. Error: ${JSON.stringify(
322
- error
323
- )})`,
324
- error.code || 1
325
- )
326
- );
327
- }
328
- )
329
- );
330
- }
331
-
332
- await queue.onIdle();
333
-
334
- unmount();
335
-
336
- const uploadMs = Date.now() - start;
337
-
338
- const skipped = fileMap.size - missingHashes.length;
339
- const skippedMessage = skipped > 0 ? `(${skipped} already uploaded) ` : "";
340
-
341
- logger.log(
342
- `✨ Success! Uploaded ${
343
- sortedFiles.length
344
- } files ${skippedMessage}${formatTime(uploadMs)}\n`
345
- );
346
-
347
- const doUpsertHashes = async (): Promise<void> => {
348
- try {
349
- return await fetchResult(`/pages/assets/upsert-hashes`, {
350
- method: "POST",
351
- headers: {
352
- "Content-Type": "application/json",
353
- Authorization: `Bearer ${jwt}`,
354
- },
355
- body: JSON.stringify({
356
- hashes: files.map(({ hash }) => hash),
357
- }),
358
- });
359
- } catch (e) {
360
- await new Promise((resolvePromise) => setTimeout(resolvePromise, 1000));
361
-
362
- if ((e as { code: number }).code === 8000013 || isJwtExpired(jwt)) {
363
- // Looks like the JWT expired, fetch another one
364
- jwt = await fetchJwt();
365
- }
366
-
367
- return await fetchResult(`/pages/assets/upsert-hashes`, {
368
- method: "POST",
369
- headers: {
370
- "Content-Type": "application/json",
371
- Authorization: `Bearer ${jwt}`,
372
- },
373
- body: JSON.stringify({
374
- hashes: files.map(({ hash }) => hash),
375
- }),
376
- });
377
- }
378
- };
379
-
380
- try {
381
- await doUpsertHashes();
382
- } catch {
383
- logger.warn(
384
- "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."
385
- );
386
- }
387
-
388
- return Object.fromEntries(
389
- [...fileMap.entries()].map(([fileName, file]) => [
390
- `/${fileName}`,
391
- file.hash,
392
- ])
393
- );
394
- };
395
-
396
- // Decode and check that the current JWT has not expired
397
- function isJwtExpired(token: string): boolean | undefined {
398
- try {
399
- const decodedJwt = JSON.parse(
400
- Buffer.from(token.split(".")[1], "base64").toString()
401
- );
402
-
403
- const dateNow = new Date().getTime() / 1000;
404
-
405
- return decodedJwt.exp <= dateNow;
406
- } catch (e) {
407
- if (e instanceof Error) {
408
- throw new Error(`Invalid token: ${e.message}`);
409
- }
410
- }
411
- }
412
-
413
- function formatTime(duration: number) {
414
- return `(${(duration / 1000).toFixed(2)} sec)`;
415
- }
416
-
417
- function Progress({ done, total }: { done: number; total: number }) {
418
- return (
419
- <>
420
- <Text>
421
- {isInteractive() ? <Spinner type="earth" /> : null}
422
- {` Uploading... (${done}/${total})\n`}
423
- </Text>
424
- </>
425
- );
426
- }
@@ -1,23 +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";
13
-
14
- export function isUrl(maybeUrl?: string): maybeUrl is string {
15
- if (!maybeUrl) return false;
16
-
17
- try {
18
- new URL(maybeUrl);
19
- return true;
20
- } catch (e) {
21
- return false;
22
- }
23
- }