wrangler 0.0.0-e6e1daba → 0.0.0-e739b7fe

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 (311) hide show
  1. package/README.md +10 -12
  2. package/bin/wrangler.js +14 -75
  3. package/package.json +226 -194
  4. package/templates/__tests__/tsconfig.json +1 -1
  5. package/templates/checked-fetch.js +10 -3
  6. package/templates/facade.d.ts +4 -1
  7. package/templates/gitignore +0 -4
  8. package/templates/init-tests/test-vitest-new-worker.js +1 -1
  9. package/templates/init-tests/test-vitest-new-worker.ts +1 -1
  10. package/templates/middleware/common.ts +9 -4
  11. package/templates/middleware/loader-modules.ts +67 -15
  12. package/templates/middleware/loader-sw.ts +6 -10
  13. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  14. package/templates/middleware/middleware-ensure-req-body-drained.ts +19 -0
  15. package/templates/middleware/middleware-miniflare3-json-error.ts +18 -5
  16. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  17. package/templates/middleware/middleware-multiworker-dev.ts +68 -0
  18. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  19. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  20. package/templates/modules-watch-stub.js +4 -0
  21. package/templates/new-worker-scheduled.ts +1 -1
  22. package/templates/new-worker.ts +1 -1
  23. package/templates/pages-dev-pipeline.ts +2 -1
  24. package/templates/pages-dev-util.ts +4 -1
  25. package/templates/pages-shim.ts +0 -3
  26. package/templates/pages-template-plugin.ts +12 -2
  27. package/templates/pages-template-worker.ts +11 -2
  28. package/templates/startDevWorker/InspectorProxyWorker.ts +661 -0
  29. package/templates/startDevWorker/ProxyWorker.ts +326 -0
  30. package/templates/tsconfig.init.json +1 -2
  31. package/templates/tsconfig.json +1 -1
  32. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  33. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  34. package/wrangler-dist/ProxyWorker.js +237 -0
  35. package/wrangler-dist/ProxyWorker.js.map +6 -0
  36. package/wrangler-dist/cli.d.ts +22647 -337
  37. package/wrangler-dist/cli.js +137196 -118219
  38. package/wrangler-dist/wasm-sync.wasm +0 -0
  39. package/import_meta_url.js +0 -3
  40. package/miniflare-config-stubs/.env.empty +0 -0
  41. package/miniflare-config-stubs/package.empty.json +0 -1
  42. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  43. package/miniflare-dist/index.mjs +0 -6368
  44. package/src/__tests__/access.test.ts +0 -25
  45. package/src/__tests__/api-dev.test.ts +0 -238
  46. package/src/__tests__/api-devregistry.test.js +0 -64
  47. package/src/__tests__/api.test.ts +0 -80
  48. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  49. package/src/__tests__/config-cache.test.ts +0 -42
  50. package/src/__tests__/configuration.test.ts +0 -4233
  51. package/src/__tests__/d1/d1.test.ts +0 -82
  52. package/src/__tests__/d1/execute.test.ts +0 -64
  53. package/src/__tests__/d1/migrate.test.ts +0 -155
  54. package/src/__tests__/d1/splitter.test.ts +0 -255
  55. package/src/__tests__/delete.test.ts +0 -266
  56. package/src/__tests__/deployments.test.ts +0 -129
  57. package/src/__tests__/dev.test.tsx +0 -1587
  58. package/src/__tests__/generate.test.ts +0 -238
  59. package/src/__tests__/get-host-from-url.test.ts +0 -16
  60. package/src/__tests__/guess-worker-format.test.ts +0 -120
  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/end-event-loop.ts +0 -6
  64. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  65. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  66. package/src/__tests__/helpers/mock-bin.ts +0 -36
  67. package/src/__tests__/helpers/mock-console.ts +0 -106
  68. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  69. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  70. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  71. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  72. package/src/__tests__/helpers/mock-istty.ts +0 -74
  73. package/src/__tests__/helpers/mock-known-routes.ts +0 -12
  74. package/src/__tests__/helpers/mock-kv.ts +0 -46
  75. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  76. package/src/__tests__/helpers/mock-process.ts +0 -34
  77. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  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/blob-worker.cjs +0 -19
  81. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  82. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -93
  83. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  84. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  85. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  86. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  87. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  88. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  89. package/src/__tests__/helpers/msw/index.ts +0 -50
  90. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  91. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  92. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  93. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  94. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  95. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  96. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  97. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  98. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  99. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  100. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  101. package/src/__tests__/https-options.test.ts +0 -163
  102. package/src/__tests__/index.test.ts +0 -274
  103. package/src/__tests__/init.test.ts +0 -3164
  104. package/src/__tests__/jest.setup.ts +0 -175
  105. package/src/__tests__/kv.test.ts +0 -1799
  106. package/src/__tests__/logger.test.ts +0 -141
  107. package/src/__tests__/logout.test.ts +0 -47
  108. package/src/__tests__/metrics.test.ts +0 -493
  109. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  110. package/src/__tests__/middleware.test.ts +0 -815
  111. package/src/__tests__/mtls-certificates.test.ts +0 -585
  112. package/src/__tests__/package-manager.test.ts +0 -353
  113. package/src/__tests__/pages/deployment-list.test.ts +0 -78
  114. package/src/__tests__/pages/functions-build.test.ts +0 -402
  115. package/src/__tests__/pages/pages.test.ts +0 -81
  116. package/src/__tests__/pages/project-create.test.ts +0 -63
  117. package/src/__tests__/pages/project-list.test.ts +0 -108
  118. package/src/__tests__/pages/project-upload.test.ts +0 -481
  119. package/src/__tests__/pages/publish.test.ts +0 -2745
  120. package/src/__tests__/pages-deployment-tail.test.ts +0 -955
  121. package/src/__tests__/parse.test.ts +0 -436
  122. package/src/__tests__/paths.test.ts +0 -39
  123. package/src/__tests__/publish.test.ts +0 -8167
  124. package/src/__tests__/pubsub.test.ts +0 -493
  125. package/src/__tests__/queues.test.ts +0 -529
  126. package/src/__tests__/r2.test.ts +0 -374
  127. package/src/__tests__/route.test.ts +0 -45
  128. package/src/__tests__/secret.test.ts +0 -693
  129. package/src/__tests__/tail.test.ts +0 -958
  130. package/src/__tests__/test-old-node-version.js +0 -31
  131. package/src/__tests__/tsconfig-sanity.ts +0 -12
  132. package/src/__tests__/tsconfig.json +0 -8
  133. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  134. package/src/__tests__/type-generation.test.ts +0 -233
  135. package/src/__tests__/user.test.ts +0 -118
  136. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  137. package/src/__tests__/validate-dev-props.test.ts +0 -56
  138. package/src/__tests__/version.test.ts +0 -35
  139. package/src/__tests__/whoami.test.tsx +0 -172
  140. package/src/__tests__/worker-namespace.test.ts +0 -339
  141. package/src/abort.d.ts +0 -3
  142. package/src/api/dev.ts +0 -328
  143. package/src/api/index.ts +0 -11
  144. package/src/api/mtls-certificate.ts +0 -148
  145. package/src/api/pages/create-worker-bundle-contents.ts +0 -75
  146. package/src/api/pages/index.ts +0 -5
  147. package/src/api/pages/publish.tsx +0 -368
  148. package/src/bundle-reporter.ts +0 -68
  149. package/src/bundle.ts +0 -877
  150. package/src/cfetch/index.ts +0 -158
  151. package/src/cfetch/internal.ts +0 -258
  152. package/src/cli.ts +0 -28
  153. package/src/config/README.md +0 -107
  154. package/src/config/config.ts +0 -282
  155. package/src/config/diagnostics.ts +0 -80
  156. package/src/config/environment.ts +0 -586
  157. package/src/config/index.ts +0 -375
  158. package/src/config/validation-helpers.ts +0 -597
  159. package/src/config/validation.ts +0 -2198
  160. package/src/config-cache.ts +0 -85
  161. package/src/create-worker-preview.ts +0 -293
  162. package/src/create-worker-upload-form.ts +0 -334
  163. package/src/d1/backups.tsx +0 -215
  164. package/src/d1/constants.ts +0 -2
  165. package/src/d1/create.tsx +0 -64
  166. package/src/d1/delete.ts +0 -53
  167. package/src/d1/execute.tsx +0 -354
  168. package/src/d1/formatTimeAgo.ts +0 -14
  169. package/src/d1/index.ts +0 -100
  170. package/src/d1/list.tsx +0 -60
  171. package/src/d1/migrations/apply.tsx +0 -206
  172. package/src/d1/migrations/create.tsx +0 -76
  173. package/src/d1/migrations/helpers.ts +0 -172
  174. package/src/d1/migrations/index.ts +0 -3
  175. package/src/d1/migrations/list.tsx +0 -92
  176. package/src/d1/migrations/options.ts +0 -23
  177. package/src/d1/options.ts +0 -22
  178. package/src/d1/splitter.ts +0 -161
  179. package/src/d1/types.ts +0 -25
  180. package/src/d1/utils.ts +0 -49
  181. package/src/delete.ts +0 -100
  182. package/src/deployments.ts +0 -116
  183. package/src/deprecated/index.ts +0 -144
  184. package/src/dev/dev-vars.ts +0 -39
  185. package/src/dev/dev.tsx +0 -600
  186. package/src/dev/get-local-persistence-path.ts +0 -31
  187. package/src/dev/local.tsx +0 -922
  188. package/src/dev/remote.tsx +0 -632
  189. package/src/dev/start-server.ts +0 -538
  190. package/src/dev/use-esbuild.ts +0 -205
  191. package/src/dev/validate-dev-props.ts +0 -31
  192. package/src/dev-registry.ts +0 -201
  193. package/src/dev.tsx +0 -914
  194. package/src/dialogs.ts +0 -136
  195. package/src/dispatch-namespace.ts +0 -211
  196. package/src/docs/index.ts +0 -97
  197. package/src/durable.ts +0 -102
  198. package/src/entry.ts +0 -327
  199. package/src/environment-variables/factory.ts +0 -88
  200. package/src/environment-variables/misc-variables.ts +0 -30
  201. package/src/errors.ts +0 -11
  202. package/src/generate/index.ts +0 -298
  203. package/src/git-client.ts +0 -135
  204. package/src/global-wrangler-config-path.ts +0 -26
  205. package/src/https-options.ts +0 -127
  206. package/src/index.ts +0 -705
  207. package/src/init.ts +0 -1022
  208. package/src/inspect.ts +0 -782
  209. package/src/intl-polyfill.d.ts +0 -139
  210. package/src/is-ci.ts +0 -14
  211. package/src/is-interactive.ts +0 -16
  212. package/src/jest.d.ts +0 -4
  213. package/src/kv/helpers.ts +0 -430
  214. package/src/kv/index.ts +0 -594
  215. package/src/logger.ts +0 -104
  216. package/src/metrics/index.ts +0 -5
  217. package/src/metrics/metrics-config.ts +0 -239
  218. package/src/metrics/metrics-dispatcher.ts +0 -96
  219. package/src/metrics/metrics-usage-headers.ts +0 -24
  220. package/src/metrics/send-event.ts +0 -98
  221. package/src/miniflare-cli/README.md +0 -30
  222. package/src/miniflare-cli/assets.ts +0 -251
  223. package/src/miniflare-cli/index.ts +0 -210
  224. package/src/miniflare-cli/request-context.ts +0 -40
  225. package/src/miniflare-cli/tsconfig.json +0 -9
  226. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  227. package/src/miniflare-cli/types.ts +0 -11
  228. package/src/module-collection.ts +0 -267
  229. package/src/mtls-certificate/cli.ts +0 -155
  230. package/src/open-in-browser.ts +0 -17
  231. package/src/package-manager.ts +0 -219
  232. package/src/pages/build.ts +0 -232
  233. package/src/pages/buildFunctions.ts +0 -130
  234. package/src/pages/constants.ts +0 -18
  235. package/src/pages/deployment-tails.ts +0 -281
  236. package/src/pages/deployments.tsx +0 -86
  237. package/src/pages/dev.ts +0 -716
  238. package/src/pages/errors.ts +0 -66
  239. package/src/pages/functions/buildPlugin.ts +0 -90
  240. package/src/pages/functions/buildWorker.ts +0 -288
  241. package/src/pages/functions/filepath-routing.test.ts +0 -234
  242. package/src/pages/functions/filepath-routing.ts +0 -189
  243. package/src/pages/functions/identifiers.ts +0 -78
  244. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  245. package/src/pages/functions/routes-consolidation.ts +0 -73
  246. package/src/pages/functions/routes-transformation.test.ts +0 -282
  247. package/src/pages/functions/routes-transformation.ts +0 -115
  248. package/src/pages/functions/routes-validation.test.ts +0 -403
  249. package/src/pages/functions/routes-validation.ts +0 -202
  250. package/src/pages/functions/routes.ts +0 -151
  251. package/src/pages/functions/tsconfig.json +0 -8
  252. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  253. package/src/pages/functions.ts +0 -86
  254. package/src/pages/hash.ts +0 -13
  255. package/src/pages/index.ts +0 -102
  256. package/src/pages/projects.tsx +0 -162
  257. package/src/pages/prompt-select-project.tsx +0 -31
  258. package/src/pages/publish.tsx +0 -276
  259. package/src/pages/types.ts +0 -46
  260. package/src/pages/upload.tsx +0 -449
  261. package/src/pages/utils.ts +0 -23
  262. package/src/parse.ts +0 -308
  263. package/src/paths.ts +0 -71
  264. package/src/proxy.ts +0 -694
  265. package/src/publish/index.ts +0 -274
  266. package/src/publish/publish.ts +0 -1065
  267. package/src/pubsub/index.ts +0 -286
  268. package/src/pubsub/pubsub-commands.ts +0 -623
  269. package/src/queues/cli/commands/consumer/add.ts +0 -65
  270. package/src/queues/cli/commands/consumer/index.ts +0 -19
  271. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  272. package/src/queues/cli/commands/create.ts +0 -25
  273. package/src/queues/cli/commands/delete.ts +0 -26
  274. package/src/queues/cli/commands/index.ts +0 -35
  275. package/src/queues/cli/commands/list.ts +0 -25
  276. package/src/queues/client.ts +0 -135
  277. package/src/queues/utils.ts +0 -18
  278. package/src/r2/constants.ts +0 -4
  279. package/src/r2/helpers.ts +0 -132
  280. package/src/r2/index.ts +0 -289
  281. package/src/routes.ts +0 -140
  282. package/src/secret/index.ts +0 -375
  283. package/src/selfsigned.d.ts +0 -29
  284. package/src/sites.ts +0 -372
  285. package/src/tail/createTail.ts +0 -406
  286. package/src/tail/filters.ts +0 -277
  287. package/src/tail/index.ts +0 -211
  288. package/src/tail/printing.ts +0 -122
  289. package/src/tsconfig-sanity.ts +0 -16
  290. package/src/type-generation.ts +0 -181
  291. package/src/update-check.ts +0 -19
  292. package/src/user/access.ts +0 -68
  293. package/src/user/auth-variables.ts +0 -113
  294. package/src/user/choose-account.tsx +0 -39
  295. package/src/user/generate-auth-url.ts +0 -33
  296. package/src/user/generate-random-state.ts +0 -16
  297. package/src/user/index.ts +0 -2
  298. package/src/user/user.ts +0 -1233
  299. package/src/utils/collectKeyValues.ts +0 -14
  300. package/src/whoami.ts +0 -135
  301. package/src/worker.ts +0 -257
  302. package/src/yargs-types.ts +0 -37
  303. package/src/zones.ts +0 -191
  304. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  305. package/templates/d1-beta-facade.js +0 -241
  306. package/templates/first-party-worker-module-facade.ts +0 -19
  307. package/templates/format-dev-errors.ts +0 -34
  308. package/templates/serve-static-assets.ts +0 -66
  309. package/templates/service-bindings-module-facade.js +0 -55
  310. package/templates/service-bindings-sw-facade.js +0 -42
  311. package/templates/tsconfig.tsbuildinfo +0 -1
@@ -1,481 +0,0 @@
1
- /* eslint-disable no-shadow */
2
- import { mkdirSync, writeFileSync } from "node:fs";
3
- import { rest } from "msw";
4
- import { endEventLoop } from "../helpers/end-event-loop";
5
- import { mockGetUploadTokenRequest } from "../helpers/mock-get-pages-upload-token";
6
- import { mockSetTimeout } from "../helpers/mock-set-timeout";
7
- import { mockAccountId, mockApiToken } from "./../helpers/mock-account-id";
8
- import { mockConsoleMethods } from "./../helpers/mock-console";
9
- import { msw } from "./../helpers/msw";
10
- import { runInTempDir } from "./../helpers/run-in-tmp";
11
- import { runWrangler } from "./../helpers/run-wrangler";
12
- import type { UploadPayloadFile } from "./../../pages/types";
13
- import type { RestRequest } from "msw";
14
-
15
- describe("project upload", () => {
16
- const ENV_COPY = process.env;
17
- const std = mockConsoleMethods();
18
-
19
- runInTempDir();
20
- mockAccountId();
21
- mockApiToken();
22
- mockSetTimeout();
23
-
24
- beforeEach(() => {
25
- process.env.CI = "true";
26
- process.env.CF_PAGES_UPLOAD_JWT = "<<funfetti-auth-jwt>>";
27
- });
28
-
29
- afterEach(async () => {
30
- process.env = ENV_COPY;
31
-
32
- // Force a tick to ensure that all promises resolve
33
- await endEventLoop();
34
- // Reset MSW after tick to ensure that all requests have been handled
35
- msw.resetHandlers();
36
- msw.restoreHandlers();
37
- });
38
-
39
- it("should upload a directory of files with a provided JWT", async () => {
40
- writeFileSync("logo.png", "foobar");
41
-
42
- msw.use(
43
- rest.post("*/pages/assets/check-missing", async (req, res, ctx) => {
44
- const body = (await req.json()) as {
45
- hashes: string[];
46
- };
47
-
48
- expect(req.headers.get("Authorization")).toBe(
49
- "Bearer <<funfetti-auth-jwt>>"
50
- );
51
- expect(body).toMatchObject({
52
- hashes: ["2082190357cfd3617ccfe04f340c6247"],
53
- });
54
-
55
- return res.once(
56
- ctx.status(200),
57
- ctx.json({
58
- success: true,
59
- errors: [],
60
- messages: [],
61
- result: body.hashes,
62
- })
63
- );
64
- }),
65
- rest.post("*/pages/assets/upload", async (req, res, ctx) => {
66
- expect(req.headers.get("Authorization")).toBe(
67
- "Bearer <<funfetti-auth-jwt>>"
68
- );
69
-
70
- expect(await req.json()).toMatchObject([
71
- {
72
- base64: true,
73
- key: "2082190357cfd3617ccfe04f340c6247",
74
- metadata: {
75
- contentType: "image/png",
76
- },
77
- value: "Zm9vYmFy",
78
- },
79
- ]);
80
-
81
- return res(
82
- ctx.status(200),
83
- ctx.json({
84
- success: true,
85
- errors: [],
86
- messages: [],
87
- result: null,
88
- })
89
- );
90
- })
91
- );
92
-
93
- await runWrangler("pages project upload .");
94
-
95
- expect(std.out).toMatchInlineSnapshot(`
96
- "✨ Success! Uploaded 1 files (TIMINGS)
97
-
98
- ✨ Upload complete!"
99
- `);
100
- });
101
-
102
- it("should avoid uploading some files", async () => {
103
- mkdirSync("some_dir/node_modules", { recursive: true });
104
- mkdirSync("some_dir/functions", { recursive: true });
105
-
106
- writeFileSync("logo.png", "foobar");
107
- writeFileSync("some_dir/functions/foo.js", "func");
108
- writeFileSync("some_dir/_headers", "headersfile");
109
-
110
- writeFileSync("_headers", "headersfile");
111
- writeFileSync("_redirects", "redirectsfile");
112
- writeFileSync("_worker.js", "workerfile");
113
- writeFileSync("_routes.json", "routesfile");
114
- mkdirSync(".git");
115
- writeFileSync(".git/foo", "gitfile");
116
- writeFileSync("some_dir/node_modules/some_package", "nodefile");
117
- mkdirSync("functions");
118
- writeFileSync("functions/foo.js", "func");
119
-
120
- // Accumulate multiple requests then assert afterwards
121
- const requests: RestRequest[] = [];
122
- msw.use(
123
- rest.post("*/pages/assets/check-missing", async (req, res, ctx) => {
124
- const body = (await req.json()) as {
125
- hashes: string[];
126
- };
127
-
128
- expect(req.headers.get("Authorization")).toBe(
129
- "Bearer <<funfetti-auth-jwt>>"
130
- );
131
- expect(body).toMatchObject({
132
- hashes: [
133
- "2082190357cfd3617ccfe04f340c6247",
134
- "95dedb64e6d4940fc2e0f11f711cc2f4",
135
- "09a79777abda8ccc8bdd51dd3ff8e9e9",
136
- ],
137
- });
138
-
139
- return res.once(
140
- ctx.status(200),
141
- ctx.json({
142
- success: true,
143
- errors: [],
144
- messages: [],
145
- result: body.hashes,
146
- })
147
- );
148
- }),
149
- rest.post("*/pages/assets/upload", (req, res, ctx) => {
150
- requests.push(req);
151
-
152
- return res(
153
- ctx.status(200),
154
- ctx.json({
155
- success: true,
156
- errors: [],
157
- messages: [],
158
- result: null,
159
- })
160
- );
161
- })
162
- );
163
-
164
- await runWrangler("pages project upload .");
165
- expect(requests.length).toBe(3);
166
-
167
- const resolvedRequests = (
168
- await Promise.all(
169
- requests.map(async (req) => await req.json<UploadPayloadFile[]>())
170
- )
171
- ).flat();
172
-
173
- const requestMap = resolvedRequests.reduce<{
174
- [key: string]: UploadPayloadFile;
175
- }>((requestMap, req) => Object.assign(requestMap, { [req.key]: req }), {});
176
-
177
- for (const req of requests) {
178
- expect(req.headers.get("Authorization")).toBe(
179
- "Bearer <<funfetti-auth-jwt>>"
180
- );
181
- }
182
-
183
- expect(Object.keys(requestMap).length).toBe(3);
184
-
185
- expect(requestMap["95dedb64e6d4940fc2e0f11f711cc2f4"]).toMatchObject({
186
- base64: true,
187
- key: "95dedb64e6d4940fc2e0f11f711cc2f4",
188
- metadata: {
189
- contentType: "application/octet-stream",
190
- },
191
- value: "aGVhZGVyc2ZpbGU=",
192
- });
193
-
194
- expect(requestMap["2082190357cfd3617ccfe04f340c6247"]).toMatchObject({
195
- base64: true,
196
- key: "2082190357cfd3617ccfe04f340c6247",
197
- metadata: {
198
- contentType: "image/png",
199
- },
200
- value: "Zm9vYmFy",
201
- });
202
-
203
- expect(requestMap["09a79777abda8ccc8bdd51dd3ff8e9e9"]).toMatchObject({
204
- base64: true,
205
- key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
206
- metadata: {
207
- contentType: "application/javascript",
208
- },
209
- value: "ZnVuYw==",
210
- });
211
-
212
- expect(std.out).toMatchInlineSnapshot(`
213
- "✨ Success! Uploaded 3 files (TIMINGS)
214
-
215
- ✨ Upload complete!"
216
- `);
217
- });
218
-
219
- it("should retry uploads", async () => {
220
- writeFileSync("logo.txt", "foobar");
221
-
222
- // Accumulate multiple requests then assert afterwards
223
- const requests: RestRequest[] = [];
224
- msw.use(
225
- rest.post("*/pages/assets/check-missing", async (req, res, ctx) => {
226
- const body = (await req.json()) as { hashes: string[] };
227
-
228
- expect(req.headers.get("Authorization")).toBe(
229
- "Bearer <<funfetti-auth-jwt>>"
230
- );
231
- expect(body).toMatchObject({
232
- hashes: ["1a98fb08af91aca4a7df1764a2c4ddb0"],
233
- });
234
-
235
- return res.once(
236
- ctx.status(200),
237
- ctx.json({
238
- success: true,
239
- errors: [],
240
- messages: [],
241
- result: body.hashes,
242
- })
243
- );
244
- }),
245
- rest.post("*/pages/assets/upload", async (req, res, ctx) => {
246
- requests.push(req);
247
-
248
- if (requests.length < 2) {
249
- return res(
250
- ctx.status(200),
251
- ctx.json({
252
- success: false,
253
- errors: [
254
- {
255
- code: 800000,
256
- message: "Something exploded, please retry",
257
- },
258
- ],
259
- messages: [],
260
- result: null,
261
- })
262
- );
263
- } else {
264
- return res(
265
- ctx.status(200),
266
- ctx.json({
267
- success: true,
268
- errors: [],
269
- messages: [],
270
- result: null,
271
- })
272
- );
273
- }
274
- })
275
- );
276
-
277
- await runWrangler("pages project upload .");
278
-
279
- // Assert two identical requests
280
- expect(requests.length).toBe(2);
281
- for (const init of requests) {
282
- expect(init.headers.get("Authorization")).toBe(
283
- "Bearer <<funfetti-auth-jwt>>"
284
- );
285
-
286
- const body = (await init.json()) as UploadPayloadFile[];
287
- expect(body).toMatchObject([
288
- {
289
- key: "1a98fb08af91aca4a7df1764a2c4ddb0",
290
- value: Buffer.from("foobar").toString("base64"),
291
- metadata: {
292
- contentType: "text/plain",
293
- },
294
- base64: true,
295
- },
296
- ]);
297
- }
298
-
299
- expect(std.out).toMatchInlineSnapshot(`
300
- "✨ Success! Uploaded 1 files (TIMINGS)
301
-
302
- ✨ Upload complete!"
303
- `);
304
- });
305
-
306
- it("should try to use multiple buckets (up to the max concurrency)", async () => {
307
- writeFileSync("logo.txt", "foobar");
308
- writeFileSync("logo.png", "foobar");
309
- writeFileSync("logo.html", "foobar");
310
- writeFileSync("logo.js", "foobar");
311
-
312
- mockGetUploadTokenRequest(
313
- "<<funfetti-auth-jwt>>",
314
- "some-account-id",
315
- "foo"
316
- );
317
-
318
- // Accumulate multiple requests then assert afterwards
319
- const requests: RestRequest[] = [];
320
- msw.use(
321
- rest.post("*/pages/assets/check-missing", async (req, res, ctx) => {
322
- const body = (await req.json()) as { hashes: string[] };
323
-
324
- expect(req.headers.get("Authorization")).toBe(
325
- "Bearer <<funfetti-auth-jwt>>"
326
- );
327
- expect(body).toMatchObject({
328
- hashes: expect.arrayContaining([
329
- "d96fef225537c9f5e44a3cb27fd0b492",
330
- "2082190357cfd3617ccfe04f340c6247",
331
- "6be321bef99e758250dac034474ddbb8",
332
- "1a98fb08af91aca4a7df1764a2c4ddb0",
333
- ]),
334
- });
335
-
336
- return res.once(
337
- ctx.status(200),
338
- ctx.json({
339
- success: true,
340
- errors: [],
341
- messages: [],
342
- result: body.hashes,
343
- })
344
- );
345
- }),
346
- rest.post("*/pages/assets/upload", async (req, res, ctx) => {
347
- requests.push(req);
348
-
349
- expect(req.headers.get("Authorization")).toBe(
350
- "Bearer <<funfetti-auth-jwt>>"
351
- );
352
-
353
- return res(
354
- ctx.status(200),
355
- ctx.json({
356
- success: true,
357
- errors: [],
358
- messages: [],
359
- result: null,
360
- })
361
- );
362
- })
363
- );
364
-
365
- await runWrangler("pages project upload .");
366
-
367
- // We have 3 buckets, so expect 3 uploads
368
- expect(requests.length).toBe(3);
369
- const bodies: UploadPayloadFile[][] = [];
370
- for (const init of requests) {
371
- bodies.push((await init.json()) as UploadPayloadFile[]);
372
- }
373
- // One bucket should end up with 2 files
374
- expect(bodies.map((b) => b.length).sort()).toEqual([1, 1, 2]);
375
- // But we don't know the order, so flatten and test without ordering
376
- expect(bodies.flatMap((b) => b)).toEqual(
377
- expect.arrayContaining([
378
- {
379
- base64: true,
380
- key: "d96fef225537c9f5e44a3cb27fd0b492",
381
- metadata: { contentType: "text/html" },
382
- value: "Zm9vYmFy",
383
- },
384
- {
385
- base64: true,
386
- key: "1a98fb08af91aca4a7df1764a2c4ddb0",
387
- metadata: { contentType: "text/plain" },
388
- value: "Zm9vYmFy",
389
- },
390
- {
391
- base64: true,
392
- key: "6be321bef99e758250dac034474ddbb8",
393
- metadata: { contentType: "application/javascript" },
394
- value: "Zm9vYmFy",
395
- },
396
- {
397
- base64: true,
398
- key: "2082190357cfd3617ccfe04f340c6247",
399
- metadata: { contentType: "image/png" },
400
- value: "Zm9vYmFy",
401
- },
402
- ])
403
- );
404
-
405
- expect(std.out).toMatchInlineSnapshot(`
406
- "✨ Success! Uploaded 4 files (TIMINGS)
407
-
408
- ✨ Upload complete!"
409
- `);
410
- });
411
-
412
- it("should not error when directory names contain periods and houses a extensionless file", async () => {
413
- mkdirSync(".well-known");
414
- // Note: same content as previous test, but since it's a different extension,
415
- // it hashes to a different value
416
- writeFileSync(".well-known/foobar", "foobar");
417
-
418
- mockGetUploadTokenRequest(
419
- "<<funfetti-auth-jwt>>",
420
- "some-account-id",
421
- "foo"
422
- );
423
-
424
- msw.use(
425
- rest.post(
426
- "*/pages/assets/check-missing",
427
-
428
- async (req, res, ctx) => {
429
- const body = (await req.json()) as { hashes: string[] };
430
-
431
- expect(req.headers.get("Authorization")).toBe(
432
- "Bearer <<funfetti-auth-jwt>>"
433
- );
434
- expect(body).toMatchObject({
435
- hashes: ["7b764dacfd211bebd8077828a7ddefd7"],
436
- });
437
-
438
- return res.once(
439
- ctx.status(200),
440
- ctx.json({
441
- success: true,
442
- errors: [],
443
- messages: [],
444
- result: body.hashes,
445
- })
446
- );
447
- }
448
- ),
449
- rest.post("*/pages/assets/upload", async (req, res, ctx) => {
450
- expect(req.headers.get("Authorization")).toBe(
451
- "Bearer <<funfetti-auth-jwt>>"
452
- );
453
- const body = (await req.json()) as UploadPayloadFile[];
454
- expect(body).toMatchObject([
455
- {
456
- key: "7b764dacfd211bebd8077828a7ddefd7",
457
- value: Buffer.from("foobar").toString("base64"),
458
- metadata: {
459
- contentType: "application/octet-stream",
460
- },
461
- base64: true,
462
- },
463
- ]);
464
-
465
- return res.once(
466
- ctx.status(200),
467
- ctx.json({
468
- success: true,
469
- errors: [],
470
- messages: [],
471
- result: null,
472
- })
473
- );
474
- })
475
- );
476
-
477
- await runWrangler("pages project upload .");
478
-
479
- expect(std.err).toMatchInlineSnapshot(`""`);
480
- });
481
- });