wrangler 0.0.0-e64812e → 0.0.0-e7a0cd5b

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