wrangler 0.0.0-e5a3814 → 0.0.0-e60dc909

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