wrangler 0.0.0-e322475 → 0.0.0-e33294b0

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 (324) hide show
  1. package/README.md +24 -4
  2. package/bin/wrangler.js +170 -62
  3. package/miniflare-dist/index.mjs +1499 -34
  4. package/package.json +193 -156
  5. package/src/__tests__/access.test.ts +25 -0
  6. package/src/__tests__/api-dev.test.ts +238 -0
  7. package/src/__tests__/api-devregistry.test.js +64 -0
  8. package/src/__tests__/api.test.ts +80 -0
  9. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  10. package/src/__tests__/config-cache.test.ts +30 -24
  11. package/src/__tests__/configuration.test.ts +4222 -3537
  12. package/src/__tests__/d1/d1.test.ts +82 -0
  13. package/src/__tests__/d1/execute.test.ts +64 -0
  14. package/src/__tests__/d1/migrate.test.ts +155 -0
  15. package/src/__tests__/d1/splitter.test.ts +255 -0
  16. package/src/__tests__/delete.test.ts +266 -0
  17. package/src/__tests__/deployments.test.ts +129 -0
  18. package/src/__tests__/dev.test.tsx +1560 -1028
  19. package/src/__tests__/generate.test.ts +238 -0
  20. package/src/__tests__/get-host-from-url.test.ts +16 -0
  21. package/src/__tests__/guess-worker-format.test.ts +68 -68
  22. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  23. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  24. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  25. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  26. package/src/__tests__/helpers/mock-bin.ts +20 -20
  27. package/src/__tests__/helpers/mock-console.ts +51 -42
  28. package/src/__tests__/helpers/mock-dialogs.ts +88 -102
  29. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  30. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  31. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  32. package/src/__tests__/helpers/mock-istty.ts +65 -18
  33. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  34. package/src/__tests__/helpers/mock-kv.ts +41 -28
  35. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  36. package/src/__tests__/helpers/mock-process.ts +23 -13
  37. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  38. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  39. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  40. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  41. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  42. package/src/__tests__/helpers/msw/handlers/deployments.ts +93 -0
  43. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  44. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  45. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  46. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  47. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  48. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  49. package/src/__tests__/helpers/msw/index.ts +50 -0
  50. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  51. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  52. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  53. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  54. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  55. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  56. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  57. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  58. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  59. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  60. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  61. package/src/__tests__/https-options.test.ts +142 -109
  62. package/src/__tests__/index.test.ts +254 -238
  63. package/src/__tests__/init.test.ts +3097 -1925
  64. package/src/__tests__/jest.setup.ts +143 -75
  65. package/src/__tests__/kv.test.ts +1788 -1509
  66. package/src/__tests__/logger.test.ts +96 -96
  67. package/src/__tests__/logout.test.ts +47 -0
  68. package/src/__tests__/metrics.test.ts +493 -0
  69. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  70. package/src/__tests__/middleware.test.ts +815 -0
  71. package/src/__tests__/mtls-certificates.test.ts +585 -0
  72. package/src/__tests__/package-manager.test.ts +303 -303
  73. package/src/__tests__/pages/deployment-list.test.ts +78 -0
  74. package/src/__tests__/pages/functions-build.test.ts +402 -0
  75. package/src/__tests__/pages/pages.test.ts +81 -0
  76. package/src/__tests__/pages/project-create.test.ts +63 -0
  77. package/src/__tests__/pages/project-list.test.ts +108 -0
  78. package/src/__tests__/pages/project-upload.test.ts +481 -0
  79. package/src/__tests__/pages/publish.test.ts +2745 -0
  80. package/src/__tests__/pages-deployment-tail.test.ts +955 -0
  81. package/src/__tests__/parse.test.ts +358 -252
  82. package/src/__tests__/paths.test.ts +39 -0
  83. package/src/__tests__/publish.test.ts +8002 -6010
  84. package/src/__tests__/pubsub.test.ts +493 -0
  85. package/src/__tests__/queues.test.ts +529 -0
  86. package/src/__tests__/r2.test.ts +369 -228
  87. package/src/__tests__/route.test.ts +18 -18
  88. package/src/__tests__/secret.test.ts +681 -469
  89. package/src/__tests__/tail.test.ts +835 -567
  90. package/src/__tests__/test-old-node-version.js +31 -0
  91. package/src/__tests__/tsconfig-sanity.ts +12 -0
  92. package/src/__tests__/tsconfig.json +8 -0
  93. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  94. package/src/__tests__/type-generation.test.ts +233 -0
  95. package/src/__tests__/user.test.ts +107 -121
  96. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  97. package/src/__tests__/validate-dev-props.test.ts +56 -0
  98. package/src/__tests__/version.test.ts +35 -0
  99. package/src/__tests__/whoami.test.tsx +165 -132
  100. package/src/__tests__/worker-namespace.test.ts +339 -0
  101. package/src/abort.d.ts +1 -1
  102. package/src/api/dev.ts +328 -0
  103. package/src/api/index.ts +11 -0
  104. package/src/api/mtls-certificate.ts +148 -0
  105. package/src/api/pages/create-worker-bundle-contents.ts +75 -0
  106. package/src/api/pages/index.ts +5 -0
  107. package/src/api/pages/publish.tsx +368 -0
  108. package/src/bundle-reporter.ts +68 -0
  109. package/src/bundle.ts +839 -167
  110. package/src/cfetch/index.ts +120 -83
  111. package/src/cfetch/internal.ts +208 -92
  112. package/src/cli.ts +23 -8
  113. package/src/config/config.ts +244 -205
  114. package/src/config/diagnostics.ts +61 -61
  115. package/src/config/environment.ts +523 -357
  116. package/src/config/index.ts +346 -196
  117. package/src/config/validation-helpers.ts +379 -366
  118. package/src/config/validation.ts +2020 -1402
  119. package/src/config-cache.ts +81 -41
  120. package/src/create-worker-preview.ts +239 -142
  121. package/src/create-worker-upload-form.ts +318 -238
  122. package/src/d1/backups.tsx +215 -0
  123. package/src/d1/constants.ts +2 -0
  124. package/src/d1/create.tsx +64 -0
  125. package/src/d1/delete.ts +53 -0
  126. package/src/d1/execute.tsx +354 -0
  127. package/src/d1/formatTimeAgo.ts +14 -0
  128. package/src/d1/index.ts +100 -0
  129. package/src/d1/list.tsx +60 -0
  130. package/src/d1/migrations/apply.tsx +206 -0
  131. package/src/d1/migrations/create.tsx +76 -0
  132. package/src/d1/migrations/helpers.ts +172 -0
  133. package/src/d1/migrations/index.ts +3 -0
  134. package/src/d1/migrations/list.tsx +92 -0
  135. package/src/d1/migrations/options.ts +23 -0
  136. package/src/d1/options.ts +22 -0
  137. package/src/d1/splitter.ts +161 -0
  138. package/src/d1/types.ts +25 -0
  139. package/src/d1/utils.ts +49 -0
  140. package/src/delete.ts +100 -0
  141. package/src/deployments.ts +116 -0
  142. package/src/deprecated/index.ts +144 -0
  143. package/src/dev/dev-vars.ts +20 -17
  144. package/src/dev/dev.tsx +530 -329
  145. package/src/dev/get-local-persistence-path.ts +31 -0
  146. package/src/dev/local.tsx +903 -301
  147. package/src/dev/remote.tsx +619 -236
  148. package/src/dev/start-server.ts +538 -0
  149. package/src/dev/use-esbuild.ts +184 -91
  150. package/src/dev/validate-dev-props.ts +31 -0
  151. package/src/dev-registry.ts +201 -0
  152. package/src/dev.tsx +914 -0
  153. package/src/dialogs.ts +136 -0
  154. package/src/dispatch-namespace.ts +211 -0
  155. package/src/docs/index.ts +97 -0
  156. package/src/durable.ts +87 -87
  157. package/src/entry.ts +236 -236
  158. package/src/environment-variables/factory.ts +88 -0
  159. package/src/environment-variables/misc-variables.ts +30 -0
  160. package/src/errors.ts +6 -6
  161. package/src/generate/index.ts +298 -0
  162. package/src/git-client.ts +112 -19
  163. package/src/global-wrangler-config-path.ts +26 -0
  164. package/src/https-options.ts +84 -80
  165. package/src/index.ts +705 -0
  166. package/src/init.ts +1022 -0
  167. package/src/inspect.ts +698 -593
  168. package/src/intl-polyfill.d.ts +123 -123
  169. package/src/is-ci.ts +14 -0
  170. package/src/is-interactive.ts +16 -0
  171. package/src/jest.d.ts +4 -0
  172. package/src/kv/helpers.ts +430 -0
  173. package/src/kv/index.ts +594 -0
  174. package/src/logger.ts +77 -46
  175. package/src/metrics/index.ts +5 -0
  176. package/src/metrics/metrics-config.ts +239 -0
  177. package/src/metrics/metrics-dispatcher.ts +96 -0
  178. package/src/metrics/metrics-usage-headers.ts +24 -0
  179. package/src/metrics/send-event.ts +98 -0
  180. package/src/miniflare-cli/assets.ts +250 -0
  181. package/src/miniflare-cli/index.ts +202 -33
  182. package/src/miniflare-cli/request-context.ts +18 -18
  183. package/src/miniflare-cli/tsconfig.json +9 -0
  184. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  185. package/src/miniflare-cli/types.ts +11 -0
  186. package/src/module-collection.ts +221 -212
  187. package/src/mtls-certificate/cli.ts +155 -0
  188. package/src/open-in-browser.ts +4 -4
  189. package/src/package-manager.ts +173 -128
  190. package/src/pages/build.ts +232 -0
  191. package/src/pages/buildFunctions.ts +130 -0
  192. package/src/pages/constants.ts +18 -0
  193. package/src/pages/deployment-tails.ts +281 -0
  194. package/src/pages/deployments.tsx +86 -0
  195. package/src/pages/dev.ts +716 -0
  196. package/src/pages/errors.ts +66 -0
  197. package/src/pages/functions/buildPlugin.ts +90 -0
  198. package/src/pages/functions/buildWorker.ts +288 -0
  199. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  200. package/src/pages/functions/filepath-routing.ts +189 -0
  201. package/src/pages/functions/identifiers.ts +78 -0
  202. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  203. package/src/pages/functions/routes-consolidation.ts +73 -0
  204. package/src/pages/functions/routes-transformation.test.ts +282 -0
  205. package/src/pages/functions/routes-transformation.ts +115 -0
  206. package/src/pages/functions/routes-validation.test.ts +403 -0
  207. package/src/pages/functions/routes-validation.ts +202 -0
  208. package/src/pages/functions/routes.ts +151 -0
  209. package/src/pages/functions/tsconfig.json +8 -0
  210. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  211. package/src/pages/functions.ts +86 -0
  212. package/src/pages/hash.ts +13 -0
  213. package/src/pages/index.ts +102 -0
  214. package/src/pages/projects.tsx +162 -0
  215. package/src/pages/prompt-select-project.tsx +31 -0
  216. package/src/pages/publish.tsx +276 -0
  217. package/src/pages/types.ts +46 -0
  218. package/src/pages/upload.tsx +449 -0
  219. package/src/pages/utils.ts +23 -0
  220. package/src/parse.ts +225 -139
  221. package/src/paths.ts +53 -8
  222. package/src/proxy.ts +623 -405
  223. package/src/publish/index.ts +274 -0
  224. package/src/publish/publish.ts +1065 -0
  225. package/src/pubsub/index.ts +286 -0
  226. package/src/pubsub/pubsub-commands.ts +623 -0
  227. package/src/queues/cli/commands/consumer/add.ts +65 -0
  228. package/src/queues/cli/commands/consumer/index.ts +19 -0
  229. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  230. package/src/queues/cli/commands/create.ts +25 -0
  231. package/src/queues/cli/commands/delete.ts +26 -0
  232. package/src/queues/cli/commands/index.ts +35 -0
  233. package/src/queues/cli/commands/list.ts +25 -0
  234. package/src/queues/client.ts +135 -0
  235. package/src/queues/utils.ts +18 -0
  236. package/src/r2/constants.ts +4 -0
  237. package/src/r2/helpers.ts +131 -0
  238. package/src/r2/index.ts +289 -0
  239. package/src/routes.ts +140 -0
  240. package/src/secret/index.ts +375 -0
  241. package/src/selfsigned.d.ts +23 -23
  242. package/src/sites.ts +372 -0
  243. package/src/tail/createTail.ts +406 -0
  244. package/src/tail/filters.ts +109 -111
  245. package/src/tail/index.ts +208 -296
  246. package/src/tail/printing.ts +101 -46
  247. package/src/tsconfig-sanity.ts +16 -0
  248. package/src/type-generation.ts +181 -0
  249. package/src/update-check.ts +11 -11
  250. package/src/user/access.ts +68 -0
  251. package/src/user/auth-variables.ts +113 -0
  252. package/src/user/choose-account.tsx +39 -0
  253. package/src/user/generate-auth-url.ts +33 -0
  254. package/src/user/generate-random-state.ts +16 -0
  255. package/src/user/index.ts +2 -0
  256. package/src/user/user.ts +1233 -0
  257. package/src/utils/collectKeyValues.ts +14 -0
  258. package/src/whoami.ts +135 -0
  259. package/src/worker.ts +183 -107
  260. package/src/yargs-types.ts +37 -0
  261. package/src/zones.ts +158 -40
  262. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  263. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  264. package/templates/__tests__/tsconfig.json +8 -0
  265. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  266. package/templates/checked-fetch.js +23 -0
  267. package/templates/d1-beta-facade.js +241 -0
  268. package/templates/facade.d.ts +14 -0
  269. package/templates/first-party-worker-module-facade.ts +19 -0
  270. package/templates/format-dev-errors.ts +34 -0
  271. package/templates/init-tests/test-jest-new-worker.js +23 -0
  272. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  273. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  274. package/templates/middleware/common.ts +62 -0
  275. package/templates/middleware/loader-modules.ts +84 -0
  276. package/templates/middleware/loader-sw.ts +233 -0
  277. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  278. package/templates/middleware/middleware-pretty-error.ts +40 -0
  279. package/templates/middleware/middleware-scheduled.ts +15 -0
  280. package/templates/new-worker-scheduled.js +3 -3
  281. package/templates/new-worker-scheduled.ts +15 -15
  282. package/templates/new-worker.js +3 -3
  283. package/templates/new-worker.ts +18 -15
  284. package/templates/no-op-worker.js +8 -8
  285. package/templates/pages-dev-pipeline.ts +31 -0
  286. package/templates/pages-dev-util.ts +52 -0
  287. package/templates/pages-shim.ts +12 -0
  288. package/templates/pages-template-plugin.ts +176 -0
  289. package/templates/pages-template-worker.ts +189 -0
  290. package/templates/serve-static-assets.ts +66 -0
  291. package/templates/service-bindings-module-facade.js +55 -0
  292. package/templates/service-bindings-sw-facade.js +42 -0
  293. package/templates/tsconfig-sanity.ts +11 -0
  294. package/templates/tsconfig.init.json +106 -0
  295. package/templates/tsconfig.json +6 -103
  296. package/templates/tsconfig.tsbuildinfo +1 -0
  297. package/wrangler-dist/cli.d.ts +1108 -0
  298. package/wrangler-dist/cli.js +131192 -112380
  299. package/wrangler-dist/wasm-sync.wasm +0 -0
  300. package/pages/functions/buildPlugin.ts +0 -105
  301. package/pages/functions/buildWorker.ts +0 -151
  302. package/pages/functions/filepath-routing.ts +0 -189
  303. package/pages/functions/identifiers.ts +0 -78
  304. package/pages/functions/routes.ts +0 -156
  305. package/pages/functions/template-plugin.ts +0 -147
  306. package/pages/functions/template-worker.ts +0 -143
  307. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  308. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  309. package/src/__tests__/pages.test.ts +0 -754
  310. package/src/bundle-reporter.tsx +0 -29
  311. package/src/dialogs.tsx +0 -135
  312. package/src/environment-variables.ts +0 -35
  313. package/src/generate-auth-url.ts +0 -33
  314. package/src/generate-random-state.ts +0 -16
  315. package/src/index.tsx +0 -2896
  316. package/src/kv.ts +0 -408
  317. package/src/miniflare-cli/enum-keys.ts +0 -17
  318. package/src/pages.tsx +0 -2093
  319. package/src/publish.ts +0 -739
  320. package/src/r2.ts +0 -50
  321. package/src/sites.tsx +0 -368
  322. package/src/user.tsx +0 -1202
  323. package/src/whoami.tsx +0 -71
  324. package/templates/static-asset-facade.js +0 -43
@@ -1,233 +1,374 @@
1
+ import * as fs from "node:fs";
2
+ import { rest } from "msw";
3
+ import prettyBytes from "pretty-bytes";
4
+ import { MAX_UPLOAD_SIZE } from "../r2/constants";
1
5
  import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
2
- import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
3
6
  import { mockConsoleMethods } from "./helpers/mock-console";
7
+ import { createFetchResult, msw, mswSuccessR2handlers } from "./helpers/msw";
4
8
  import { runInTempDir } from "./helpers/run-in-tmp";
5
9
  import { runWrangler } from "./helpers/run-wrangler";
6
- import type { R2BucketInfo } from "../r2";
7
-
8
- describe("wrangler", () => {
9
- mockAccountId();
10
- mockApiToken();
11
- runInTempDir();
12
- const std = mockConsoleMethods();
13
-
14
- afterEach(() => {
15
- unsetAllMocks();
16
- });
17
-
18
- describe("r2", () => {
19
- describe("bucket", () => {
20
- it("should show the correct help when an invalid command is passed", async () => {
21
- await expect(() =>
22
- runWrangler("r2 bucket foo")
23
- ).rejects.toThrowErrorMatchingInlineSnapshot(`"Unknown argument: foo"`);
24
- expect(std.err).toMatchInlineSnapshot(`
25
- "X [ERROR] Unknown argument: foo
26
-
27
- "
28
- `);
29
- expect(std.out).toMatchInlineSnapshot(`
30
- "
31
- wrangler r2 bucket
32
-
33
- Manage R2 buckets
34
-
35
- Commands:
36
- wrangler r2 bucket create <name> Create a new R2 bucket
37
- wrangler r2 bucket list List R2 buckets
38
- wrangler r2 bucket delete <name> Delete an R2 bucket
39
-
40
- Flags:
41
- -c, --config Path to .toml configuration file [string]
42
- -h, --help Show help [boolean]
43
- -v, --version Show version number [boolean]"
44
- `);
45
- });
46
-
47
- describe("list", () => {
48
- function mockListRequest(buckets: R2BucketInfo[]) {
49
- const requests = { count: 0 };
50
- setMockResponse(
51
- "/accounts/:accountId/r2/buckets",
52
- ([_url, accountId], init) => {
53
- requests.count++;
54
- expect(accountId).toEqual("some-account-id");
55
- expect(init).toEqual({});
56
- return { buckets };
57
- }
58
- );
59
- return requests;
60
- }
61
-
62
- it("should list buckets", async () => {
63
- const expectedBuckets: R2BucketInfo[] = [
64
- { name: "bucket-1", creation_date: "01-01-2001" },
65
- { name: "bucket-2", creation_date: "01-01-2001" },
66
- ];
67
- mockListRequest(expectedBuckets);
68
- await runWrangler("r2 bucket list");
69
-
70
- expect(std.err).toMatchInlineSnapshot(`""`);
71
- const buckets = JSON.parse(std.out);
72
- expect(buckets).toEqual(expectedBuckets);
73
- });
74
- });
75
-
76
- describe("create", () => {
77
- function mockCreateRequest(expectedBucketName: string) {
78
- const requests = { count: 0 };
79
- setMockResponse(
80
- "/accounts/:accountId/r2/buckets/:bucketName",
81
- "PUT",
82
- ([_url, accountId, bucketName]) => {
83
- expect(accountId).toEqual("some-account-id");
84
- expect(bucketName).toEqual(expectedBucketName);
85
- requests.count += 1;
86
- }
87
- );
88
- return requests;
89
- }
90
-
91
- it("should error if no bucket name is given", async () => {
92
- await expect(
93
- runWrangler("r2 bucket create")
94
- ).rejects.toThrowErrorMatchingInlineSnapshot(
95
- `"Not enough non-option arguments: got 0, need at least 1"`
96
- );
97
- expect(std.out).toMatchInlineSnapshot(`
98
- "
99
- wrangler r2 bucket create <name>
100
-
101
- Create a new R2 bucket
102
-
103
- Positionals:
104
- name The name of the new bucket [string] [required]
105
-
106
- Flags:
107
- -c, --config Path to .toml configuration file [string]
108
- -h, --help Show help [boolean]
109
- -v, --version Show version number [boolean]"
110
- `);
111
- expect(std.err).toMatchInlineSnapshot(`
112
- "X [ERROR] Not enough non-option arguments: got 0, need at least 1
113
-
114
- "
115
- `);
116
- });
117
-
118
- it("should error if the bucket to create contains spaces", async () => {
119
- await expect(
120
- runWrangler("r2 bucket create abc def ghi")
121
- ).rejects.toThrowErrorMatchingInlineSnapshot(
122
- `"Unknown arguments: def, ghi"`
123
- );
124
- expect(std.out).toMatchInlineSnapshot(`
125
- "
126
- wrangler r2 bucket create <name>
127
-
128
- Create a new R2 bucket
129
-
130
- Positionals:
131
- name The name of the new bucket [string] [required]
132
-
133
- Flags:
134
- -c, --config Path to .toml configuration file [string]
135
- -h, --help Show help [boolean]
136
- -v, --version Show version number [boolean]"
137
- `);
138
- expect(std.err).toMatchInlineSnapshot(`
139
- "X [ERROR] Unknown arguments: def, ghi
140
-
141
- "
142
- `);
143
- });
144
-
145
- it("should create a bucket", async () => {
146
- const requests = mockCreateRequest("testBucket");
147
- await runWrangler("r2 bucket create testBucket");
148
- expect(std.out).toMatchInlineSnapshot(`
149
- "Creating bucket testBucket.
150
- Created bucket testBucket."
151
- `);
152
- expect(requests.count).toEqual(1);
153
- });
154
- });
155
-
156
- describe("delete", () => {
157
- function mockDeleteRequest(expectedBucketName: string) {
158
- const requests = { count: 0 };
159
- setMockResponse(
160
- "/accounts/:accountId/r2/buckets/:bucketName",
161
- "DELETE",
162
- ([_url, accountId, bucketName]) => {
163
- expect(accountId).toEqual("some-account-id");
164
- expect(bucketName).toEqual(expectedBucketName);
165
- requests.count += 1;
166
- }
167
- );
168
- return requests;
169
- }
170
-
171
- it("should error if no bucket name is given", async () => {
172
- await expect(
173
- runWrangler("r2 bucket delete")
174
- ).rejects.toThrowErrorMatchingInlineSnapshot(
175
- `"Not enough non-option arguments: got 0, need at least 1"`
176
- );
177
- expect(std.out).toMatchInlineSnapshot(`
178
- "
179
- wrangler r2 bucket delete <name>
180
-
181
- Delete an R2 bucket
182
-
183
- Positionals:
184
- name The name of the bucket to delete [string] [required]
185
-
186
- Flags:
187
- -c, --config Path to .toml configuration file [string]
188
- -h, --help Show help [boolean]
189
- -v, --version Show version number [boolean]"
190
- `);
191
- expect(std.err).toMatchInlineSnapshot(`
192
- "X [ERROR] Not enough non-option arguments: got 0, need at least 1
193
-
194
- "
195
- `);
196
- });
197
-
198
- it("should error if the bucket name to delete contains spaces", async () => {
199
- await expect(
200
- runWrangler("r2 bucket delete abc def ghi")
201
- ).rejects.toThrowErrorMatchingInlineSnapshot(
202
- `"Unknown arguments: def, ghi"`
203
- );
204
- expect(std.out).toMatchInlineSnapshot(`
205
- "
206
- wrangler r2 bucket delete <name>
207
-
208
- Delete an R2 bucket
209
-
210
- Positionals:
211
- name The name of the bucket to delete [string] [required]
212
-
213
- Flags:
214
- -c, --config Path to .toml configuration file [string]
215
- -h, --help Show help [boolean]
216
- -v, --version Show version number [boolean]"
217
- `);
218
- expect(std.err).toMatchInlineSnapshot(`
219
- "X [ERROR] Unknown arguments: def, ghi
220
-
221
- "
222
- `);
223
- });
224
-
225
- it("should delete a bucket specified by name", async () => {
226
- const requests = mockDeleteRequest("some-bucket");
227
- await runWrangler(`r2 bucket delete some-bucket`);
228
- expect(requests.count).toEqual(1);
229
- });
230
- });
231
- });
232
- });
10
+ import type { R2BucketInfo } from "../r2/helpers";
11
+
12
+ describe("r2", () => {
13
+ const std = mockConsoleMethods();
14
+ beforeEach(() => msw.use(...mswSuccessR2handlers));
15
+
16
+ mockAccountId();
17
+ mockApiToken();
18
+ runInTempDir();
19
+
20
+ describe("bucket", () => {
21
+ it("should show the correct help when an invalid command is passed", async () => {
22
+ await expect(() =>
23
+ runWrangler("r2 bucket foo")
24
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"Unknown argument: foo"`);
25
+ expect(std.err).toMatchInlineSnapshot(`
26
+ "X [ERROR] Unknown argument: foo
27
+
28
+ "
29
+ `);
30
+ expect(std.out).toMatchInlineSnapshot(`
31
+ "
32
+ wrangler r2 bucket
33
+
34
+ Manage R2 buckets
35
+
36
+ Commands:
37
+ wrangler r2 bucket create <name> Create a new R2 bucket
38
+ wrangler r2 bucket list List R2 buckets
39
+ wrangler r2 bucket delete <name> Delete an R2 bucket
40
+
41
+ Flags:
42
+ -j, --experimental-json-config Experimental: Support wrangler.json [boolean]
43
+ -c, --config Path to .toml configuration file [string]
44
+ -e, --env Environment to use for operations and .env files [string]
45
+ -h, --help Show help [boolean]
46
+ -v, --version Show version number [boolean]"
47
+ `);
48
+ });
49
+
50
+ describe("list", () => {
51
+ it("should list buckets & check request inputs", async () => {
52
+ const expectedBuckets: R2BucketInfo[] = [
53
+ { name: "bucket-1-local-once", creation_date: "01-01-2001" },
54
+ { name: "bucket-2-local-once", creation_date: "01-01-2001" },
55
+ ];
56
+ msw.use(
57
+ rest.get(
58
+ "*/accounts/:accountId/r2/buckets",
59
+ async (request, response, context) => {
60
+ const { accountId } = request.params;
61
+ expect(accountId).toEqual("some-account-id");
62
+ expect(await request.text()).toEqual("");
63
+ return response.once(
64
+ context.json(
65
+ createFetchResult({
66
+ buckets: [
67
+ {
68
+ name: "bucket-1-local-once",
69
+ creation_date: "01-01-2001",
70
+ },
71
+ {
72
+ name: "bucket-2-local-once",
73
+ creation_date: "01-01-2001",
74
+ },
75
+ ],
76
+ })
77
+ )
78
+ );
79
+ }
80
+ )
81
+ );
82
+ await runWrangler("r2 bucket list");
83
+
84
+ expect(std.err).toMatchInlineSnapshot(`""`);
85
+ const buckets = JSON.parse(std.out);
86
+ expect(buckets).toEqual(expectedBuckets);
87
+ });
88
+ });
89
+
90
+ describe("create", () => {
91
+ it("should error if no bucket name is given", async () => {
92
+ await expect(
93
+ runWrangler("r2 bucket create")
94
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
95
+ `"Not enough non-option arguments: got 0, need at least 1"`
96
+ );
97
+ expect(std.out).toMatchInlineSnapshot(`
98
+ "
99
+ wrangler r2 bucket create <name>
100
+
101
+ Create a new R2 bucket
102
+
103
+ Positionals:
104
+ name The name of the new bucket [string] [required]
105
+
106
+ Flags:
107
+ -j, --experimental-json-config Experimental: Support wrangler.json [boolean]
108
+ -c, --config Path to .toml configuration file [string]
109
+ -e, --env Environment to use for operations and .env files [string]
110
+ -h, --help Show help [boolean]
111
+ -v, --version Show version number [boolean]"
112
+ `);
113
+ expect(std.err).toMatchInlineSnapshot(`
114
+ "X [ERROR] Not enough non-option arguments: got 0, need at least 1
115
+
116
+ "
117
+ `);
118
+ });
119
+
120
+ it("should error if the bucket to create contains spaces", async () => {
121
+ await expect(
122
+ runWrangler("r2 bucket create abc def ghi")
123
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
124
+ `"Unknown arguments: def, ghi"`
125
+ );
126
+ expect(std.out).toMatchInlineSnapshot(`
127
+ "
128
+ wrangler r2 bucket create <name>
129
+
130
+ Create a new R2 bucket
131
+
132
+ Positionals:
133
+ name The name of the new bucket [string] [required]
134
+
135
+ Flags:
136
+ -j, --experimental-json-config Experimental: Support wrangler.json [boolean]
137
+ -c, --config Path to .toml configuration file [string]
138
+ -e, --env Environment to use for operations and .env files [string]
139
+ -h, --help Show help [boolean]
140
+ -v, --version Show version number [boolean]"
141
+ `);
142
+ expect(std.err).toMatchInlineSnapshot(`
143
+ "X [ERROR] Unknown arguments: def, ghi
144
+
145
+ "
146
+ `);
147
+ });
148
+
149
+ it("should create a bucket & check request inputs", async () => {
150
+ msw.use(
151
+ rest.post(
152
+ "*/accounts/:accountId/r2/buckets",
153
+ async (request, response, context) => {
154
+ const { accountId } = request.params;
155
+ expect(accountId).toEqual("some-account-id");
156
+ expect(await request.json()).toEqual({ name: "testBucket" });
157
+ return response.once(context.json(createFetchResult({})));
158
+ }
159
+ )
160
+ );
161
+ await runWrangler("r2 bucket create testBucket");
162
+ expect(std.out).toMatchInlineSnapshot(`
163
+ "Creating bucket testBucket.
164
+ Created bucket testBucket."
165
+ `);
166
+ });
167
+ });
168
+
169
+ describe("delete", () => {
170
+ it("should error if no bucket name is given", async () => {
171
+ await expect(
172
+ runWrangler("r2 bucket delete")
173
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
174
+ `"Not enough non-option arguments: got 0, need at least 1"`
175
+ );
176
+ expect(std.out).toMatchInlineSnapshot(`
177
+ "
178
+ wrangler r2 bucket delete <name>
179
+
180
+ Delete an R2 bucket
181
+
182
+ Positionals:
183
+ name The name of the bucket to delete [string] [required]
184
+
185
+ Flags:
186
+ -j, --experimental-json-config Experimental: Support wrangler.json [boolean]
187
+ -c, --config Path to .toml configuration file [string]
188
+ -e, --env Environment to use for operations and .env files [string]
189
+ -h, --help Show help [boolean]
190
+ -v, --version Show version number [boolean]"
191
+ `);
192
+ expect(std.err).toMatchInlineSnapshot(`
193
+ "X [ERROR] Not enough non-option arguments: got 0, need at least 1
194
+
195
+ "
196
+ `);
197
+ });
198
+
199
+ it("should error if the bucket name to delete contains spaces", async () => {
200
+ await expect(
201
+ runWrangler("r2 bucket delete abc def ghi")
202
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
203
+ `"Unknown arguments: def, ghi"`
204
+ );
205
+ expect(std.out).toMatchInlineSnapshot(`
206
+ "
207
+ wrangler r2 bucket delete <name>
208
+
209
+ Delete an R2 bucket
210
+
211
+ Positionals:
212
+ name The name of the bucket to delete [string] [required]
213
+
214
+ Flags:
215
+ -j, --experimental-json-config Experimental: Support wrangler.json [boolean]
216
+ -c, --config Path to .toml configuration file [string]
217
+ -e, --env Environment to use for operations and .env files [string]
218
+ -h, --help Show help [boolean]
219
+ -v, --version Show version number [boolean]"
220
+ `);
221
+ expect(std.err).toMatchInlineSnapshot(`
222
+ "X [ERROR] Unknown arguments: def, ghi
223
+
224
+ "
225
+ `);
226
+ });
227
+
228
+ it("should delete a bucket specified by name & check requests inputs", async () => {
229
+ msw.use(
230
+ rest.delete(
231
+ "*/accounts/:accountId/r2/buckets/:bucketName",
232
+ async (request, response, context) => {
233
+ const { accountId, bucketName } = request.params;
234
+ expect(accountId).toEqual("some-account-id");
235
+ expect(bucketName).toEqual("some-bucket");
236
+ expect(await request.text()).toEqual("");
237
+ expect(request.headers.get("authorization")).toEqual(
238
+ "Bearer some-api-token"
239
+ );
240
+
241
+ return response.once(context.json(createFetchResult(null)));
242
+ }
243
+ )
244
+ );
245
+ await runWrangler(`r2 bucket delete some-bucket`);
246
+ expect(std.out).toMatchInlineSnapshot(`
247
+ "Deleting bucket some-bucket.
248
+ Deleted bucket some-bucket."
249
+ `);
250
+ });
251
+ });
252
+ });
253
+
254
+ describe("r2 object", () => {
255
+ it("should download R2 object from bucket", async () => {
256
+ await runWrangler(
257
+ `r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
258
+ );
259
+
260
+ expect(std.out).toMatchInlineSnapshot(`
261
+ "Downloading \\"wormhole-img.png\\" from \\"bucketName-object-test\\".
262
+ Download complete."
263
+ `);
264
+ });
265
+
266
+ it("should upload R2 object to bucket", async () => {
267
+ fs.writeFileSync("wormhole-img.png", "passageway");
268
+ await runWrangler(
269
+ `r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
270
+ );
271
+
272
+ expect(std.out).toMatchInlineSnapshot(`
273
+ "Creating object \\"wormhole-img.png\\" in bucket \\"bucketName-object-test\\".
274
+ Upload complete."
275
+ `);
276
+ });
277
+
278
+ it("should fail to upload R2 object to bucket if too large", async () => {
279
+ const TOO_BIG_FILE_SIZE = MAX_UPLOAD_SIZE + 1024 * 1024;
280
+ fs.writeFileSync("wormhole-img.png", Buffer.alloc(TOO_BIG_FILE_SIZE));
281
+ await expect(
282
+ runWrangler(
283
+ `r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
284
+ )
285
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`
286
+ "Error: Wrangler only supports uploading files up to ${prettyBytes(
287
+ MAX_UPLOAD_SIZE
288
+ )} in size
289
+ wormhole-img.png is ${prettyBytes(TOO_BIG_FILE_SIZE)} in size"
290
+ `);
291
+ });
292
+
293
+ it("should pass all fetch option flags into requestInit & check request inputs", async () => {
294
+ msw.use(
295
+ rest.put(
296
+ "*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
297
+ (request, response, context) => {
298
+ const { accountId, bucketName, objectName } = request.params;
299
+ expect(accountId).toEqual("some-account-id");
300
+ expect(bucketName).toEqual("bucketName-object-test");
301
+ expect(objectName).toEqual("wormhole-img.png");
302
+ const headersObject = request.headers.all();
303
+ delete headersObject["user-agent"];
304
+ expect(headersObject).toMatchInlineSnapshot(`
305
+ Object {
306
+ "accept": "*/*",
307
+ "accept-encoding": "gzip,deflate",
308
+ "authorization": "Bearer some-api-token",
309
+ "cache-control": "cache-control-mock",
310
+ "connection": "close",
311
+ "content-disposition": "content-disposition-mock",
312
+ "content-encoding": "content-encoding-mock",
313
+ "content-language": "content-lang-mock",
314
+ "content-length": "10",
315
+ "content-type": "content-type-mock",
316
+ "expires": "expire-time-mock",
317
+ "host": "api.cloudflare.com",
318
+ }
319
+ `);
320
+ return response.once(
321
+ context.json(
322
+ createFetchResult({
323
+ accountId: "some-account-id",
324
+ bucketName: "bucketName-object-test",
325
+ objectName: "wormhole-img.png",
326
+ })
327
+ )
328
+ );
329
+ }
330
+ )
331
+ );
332
+ fs.writeFileSync("wormhole-img.png", "passageway");
333
+ const flags =
334
+ "--ct content-type-mock --cd content-disposition-mock --ce content-encoding-mock --cl content-lang-mock --cc cache-control-mock --e expire-time-mock";
335
+
336
+ await runWrangler(
337
+ `r2 object put bucketName-object-test/wormhole-img.png ${flags} --file wormhole-img.png`
338
+ );
339
+
340
+ expect(std.out).toMatchInlineSnapshot(`
341
+ "Creating object \\"wormhole-img.png\\" in bucket \\"bucketName-object-test\\".
342
+ Upload complete."
343
+ `);
344
+ });
345
+
346
+ it("should delete R2 object from bucket", async () => {
347
+ await runWrangler(
348
+ `r2 object delete bucketName-object-test/wormhole-img.png`
349
+ );
350
+
351
+ expect(std.out).toMatchInlineSnapshot(`
352
+ "Deleting object \\"wormhole-img.png\\" from bucket \\"bucketName-object-test\\".
353
+ Delete complete."
354
+ `);
355
+ });
356
+
357
+ it("should not allow `--pipe` & `--file` to run together", async () => {
358
+ fs.writeFileSync("wormhole-img.png", "passageway");
359
+ await expect(
360
+ runWrangler(
361
+ `r2 object put bucketName-object-test/wormhole-img.png --pipe --file wormhole-img.png`
362
+ )
363
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
364
+ `"Arguments pipe and file are mutually exclusive"`
365
+ );
366
+
367
+ expect(std.err).toMatchInlineSnapshot(`
368
+ "X [ERROR] Arguments pipe and file are mutually exclusive
369
+
370
+ "
371
+ `);
372
+ });
373
+ });
233
374
  });