wrangler 0.0.0-e61fba8 → 0.0.0-e665ccc3

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 (339) hide show
  1. package/README.md +24 -4
  2. package/bin/wrangler.js +170 -62
  3. package/miniflare-dist/index.mjs +1643 -83
  4. package/package.json +198 -154
  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.ts +121 -0
  8. package/src/__tests__/api.test.ts +102 -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 +4506 -3476
  12. package/src/__tests__/constellation.test.ts +371 -0
  13. package/src/__tests__/d1/d1.test.ts +82 -0
  14. package/src/__tests__/d1/execute.test.ts +66 -0
  15. package/src/__tests__/d1/migrate.test.ts +257 -0
  16. package/src/__tests__/d1/splitter.test.ts +255 -0
  17. package/src/__tests__/delete.test.ts +272 -0
  18. package/src/__tests__/deployments.test.ts +369 -0
  19. package/src/__tests__/dev.test.tsx +1590 -983
  20. package/src/__tests__/generate.test.ts +237 -0
  21. package/src/__tests__/get-host-from-url.test.ts +16 -0
  22. package/src/__tests__/guess-worker-format.test.ts +103 -68
  23. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  24. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  25. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  26. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  27. package/src/__tests__/helpers/mock-bin.ts +20 -20
  28. package/src/__tests__/helpers/mock-console.ts +64 -39
  29. package/src/__tests__/helpers/mock-dialogs.ts +88 -79
  30. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  31. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  32. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  33. package/src/__tests__/helpers/mock-istty.ts +65 -18
  34. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  35. package/src/__tests__/helpers/mock-kv.ts +41 -28
  36. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  37. package/src/__tests__/helpers/mock-process.ts +34 -0
  38. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  39. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  40. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  41. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  42. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  43. package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
  44. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  45. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  46. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  47. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  48. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  49. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  50. package/src/__tests__/helpers/msw/index.ts +52 -0
  51. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  52. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  53. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  54. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  55. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  56. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  58. package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  60. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  61. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  62. package/src/__tests__/https-options.test.ts +142 -109
  63. package/src/__tests__/index.test.ts +262 -237
  64. package/src/__tests__/init.test.ts +3167 -1608
  65. package/src/__tests__/jest.setup.ts +152 -50
  66. package/src/__tests__/kv.test.ts +1789 -1492
  67. package/src/__tests__/logger.test.ts +167 -75
  68. package/src/__tests__/logout.test.ts +47 -0
  69. package/src/__tests__/metrics.test.ts +493 -0
  70. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  71. package/src/__tests__/middleware.test.ts +816 -0
  72. package/src/__tests__/mtls-certificates.test.ts +589 -0
  73. package/src/__tests__/package-manager.test.ts +303 -303
  74. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  75. package/src/__tests__/pages/functions-build.test.ts +528 -0
  76. package/src/__tests__/pages/pages.test.ts +81 -0
  77. package/src/__tests__/pages/project-create.test.ts +63 -0
  78. package/src/__tests__/pages/project-list.test.ts +110 -0
  79. package/src/__tests__/pages/project-upload.test.ts +500 -0
  80. package/src/__tests__/pages/publish.test.ts +2864 -0
  81. package/src/__tests__/pages-deployment-tail.test.ts +957 -0
  82. package/src/__tests__/parse.test.ts +358 -252
  83. package/src/__tests__/paths.test.ts +39 -0
  84. package/src/__tests__/publish.test.ts +8716 -5687
  85. package/src/__tests__/pubsub.test.ts +496 -0
  86. package/src/__tests__/queues.test.ts +532 -0
  87. package/src/__tests__/r2.test.ts +369 -228
  88. package/src/__tests__/route.test.ts +18 -18
  89. package/src/__tests__/secret.test.ts +681 -469
  90. package/src/__tests__/tail.test.ts +866 -567
  91. package/src/__tests__/test-old-node-version.js +31 -0
  92. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  93. package/src/__tests__/tsconfig-sanity.ts +12 -0
  94. package/src/__tests__/tsconfig.json +8 -0
  95. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  96. package/src/__tests__/type-generation.test.ts +234 -0
  97. package/src/__tests__/user.test.ts +107 -120
  98. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  99. package/src/__tests__/validate-dev-props.test.ts +56 -0
  100. package/src/__tests__/version.test.ts +35 -0
  101. package/src/__tests__/whoami.test.tsx +165 -132
  102. package/src/__tests__/worker-namespace.test.ts +340 -0
  103. package/src/abort.d.ts +1 -1
  104. package/src/api/dev.ts +321 -0
  105. package/src/api/index.ts +11 -0
  106. package/src/api/mtls-certificate.ts +148 -0
  107. package/src/api/pages/create-worker-bundle-contents.ts +77 -0
  108. package/src/api/pages/index.ts +5 -0
  109. package/src/api/pages/publish.tsx +371 -0
  110. package/src/bundle-reporter.ts +68 -0
  111. package/src/bundle.ts +890 -165
  112. package/src/cfetch/index.ts +120 -83
  113. package/src/cfetch/internal.ts +208 -92
  114. package/src/cli.ts +23 -8
  115. package/src/config/config.ts +244 -196
  116. package/src/config/diagnostics.ts +61 -61
  117. package/src/config/environment.ts +562 -357
  118. package/src/config/index.ts +374 -196
  119. package/src/config/validation-helpers.ts +379 -366
  120. package/src/config/validation.ts +2197 -1376
  121. package/src/config-cache.ts +81 -41
  122. package/src/constellation/createProject.tsx +51 -0
  123. package/src/constellation/deleteProject.ts +51 -0
  124. package/src/constellation/deleteProjectModel.ts +68 -0
  125. package/src/constellation/index.ts +75 -0
  126. package/src/constellation/listCatalog.tsx +35 -0
  127. package/src/constellation/listModel.tsx +41 -0
  128. package/src/constellation/listProject.tsx +28 -0
  129. package/src/constellation/listRuntime.tsx +28 -0
  130. package/src/constellation/options.ts +17 -0
  131. package/src/constellation/types.ts +17 -0
  132. package/src/constellation/uploadModel.tsx +64 -0
  133. package/src/constellation/utils.ts +90 -0
  134. package/src/create-worker-preview.ts +250 -142
  135. package/src/create-worker-upload-form.ts +347 -238
  136. package/src/d1/backups.tsx +219 -0
  137. package/src/d1/constants.ts +2 -0
  138. package/src/d1/create.tsx +70 -0
  139. package/src/d1/delete.ts +53 -0
  140. package/src/d1/execute.tsx +357 -0
  141. package/src/d1/formatTimeAgo.ts +14 -0
  142. package/src/d1/index.ts +100 -0
  143. package/src/d1/list.tsx +62 -0
  144. package/src/d1/migrations/apply.tsx +212 -0
  145. package/src/d1/migrations/create.tsx +79 -0
  146. package/src/d1/migrations/helpers.ts +169 -0
  147. package/src/d1/migrations/index.ts +3 -0
  148. package/src/d1/migrations/list.tsx +95 -0
  149. package/src/d1/migrations/options.ts +23 -0
  150. package/src/d1/options.ts +22 -0
  151. package/src/d1/splitter.ts +161 -0
  152. package/src/d1/types.ts +25 -0
  153. package/src/d1/utils.ts +49 -0
  154. package/src/delete.ts +100 -0
  155. package/src/deployments.ts +368 -0
  156. package/src/deprecated/index.ts +144 -0
  157. package/src/dev/dev-vars.ts +20 -17
  158. package/src/dev/dev.tsx +535 -325
  159. package/src/dev/get-local-persistence-path.ts +31 -0
  160. package/src/dev/local.tsx +932 -301
  161. package/src/dev/remote.tsx +623 -228
  162. package/src/dev/start-server.ts +545 -0
  163. package/src/dev/use-esbuild.ts +194 -94
  164. package/src/dev/validate-dev-props.ts +40 -0
  165. package/src/dev-registry.ts +202 -0
  166. package/src/dev.tsx +934 -0
  167. package/src/dialogs.ts +136 -0
  168. package/src/dispatch-namespace.ts +211 -0
  169. package/src/docs/helpers.ts +50 -0
  170. package/src/docs/index.ts +54 -0
  171. package/src/durable.ts +87 -87
  172. package/src/entry.ts +253 -231
  173. package/src/environment-variables/factory.ts +89 -0
  174. package/src/environment-variables/misc-variables.ts +30 -0
  175. package/src/errors.ts +6 -6
  176. package/src/generate/index.ts +298 -0
  177. package/src/git-client.ts +135 -0
  178. package/src/global-wrangler-config-path.ts +26 -0
  179. package/src/https-options.ts +84 -80
  180. package/src/index.ts +768 -0
  181. package/src/init.ts +1037 -0
  182. package/src/inspect.ts +816 -595
  183. package/src/intl-polyfill.d.ts +123 -123
  184. package/src/is-ci.ts +14 -0
  185. package/src/is-interactive.ts +16 -0
  186. package/src/jest.d.ts +4 -0
  187. package/src/kv/helpers.ts +433 -0
  188. package/src/kv/index.ts +594 -0
  189. package/src/logger.ts +100 -43
  190. package/src/metrics/index.ts +5 -0
  191. package/src/metrics/metrics-config.ts +239 -0
  192. package/src/metrics/metrics-dispatcher.ts +96 -0
  193. package/src/metrics/metrics-usage-headers.ts +24 -0
  194. package/src/metrics/send-event.ts +99 -0
  195. package/src/miniflare-cli/assets.ts +255 -0
  196. package/src/miniflare-cli/index.ts +202 -33
  197. package/src/miniflare-cli/request-context.ts +18 -18
  198. package/src/miniflare-cli/tsconfig.json +9 -0
  199. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  200. package/src/miniflare-cli/types.ts +11 -0
  201. package/src/module-collection.ts +290 -215
  202. package/src/mtls-certificate/cli.ts +155 -0
  203. package/src/open-in-browser.ts +4 -6
  204. package/src/package-manager.ts +173 -128
  205. package/src/pages/build.ts +423 -0
  206. package/src/pages/buildFunctions.ts +140 -0
  207. package/src/pages/constants.ts +18 -0
  208. package/src/pages/deployment-tails.ts +281 -0
  209. package/src/pages/deployments.tsx +84 -0
  210. package/src/pages/dev.ts +734 -0
  211. package/src/pages/errors.ts +67 -0
  212. package/src/pages/functions/buildPlugin.ts +114 -0
  213. package/src/pages/functions/buildWorker.ts +350 -0
  214. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  215. package/src/pages/functions/filepath-routing.ts +189 -0
  216. package/src/pages/functions/identifiers.ts +78 -0
  217. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  218. package/src/pages/functions/routes-consolidation.ts +73 -0
  219. package/src/pages/functions/routes-transformation.test.ts +282 -0
  220. package/src/pages/functions/routes-transformation.ts +115 -0
  221. package/src/pages/functions/routes-validation.test.ts +403 -0
  222. package/src/pages/functions/routes-validation.ts +202 -0
  223. package/src/pages/functions/routes.ts +151 -0
  224. package/src/pages/functions/tsconfig.json +8 -0
  225. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  226. package/src/pages/functions.ts +86 -0
  227. package/src/pages/hash.ts +13 -0
  228. package/src/pages/index.ts +102 -0
  229. package/src/pages/projects.tsx +159 -0
  230. package/src/pages/prompt-select-project.tsx +31 -0
  231. package/src/pages/publish.tsx +267 -0
  232. package/src/pages/types.ts +46 -0
  233. package/src/pages/upload.tsx +469 -0
  234. package/src/pages/utils.ts +23 -0
  235. package/src/parse.ts +225 -139
  236. package/src/paths.ts +53 -8
  237. package/src/proxy.ts +623 -407
  238. package/src/publish/index.ts +274 -0
  239. package/src/publish/publish.ts +1065 -0
  240. package/src/pubsub/index.ts +286 -0
  241. package/src/pubsub/pubsub-commands.ts +623 -0
  242. package/src/queues/cli/commands/consumer/add.ts +71 -0
  243. package/src/queues/cli/commands/consumer/index.ts +19 -0
  244. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  245. package/src/queues/cli/commands/create.ts +25 -0
  246. package/src/queues/cli/commands/delete.ts +26 -0
  247. package/src/queues/cli/commands/index.ts +35 -0
  248. package/src/queues/cli/commands/list.ts +25 -0
  249. package/src/queues/client.ts +136 -0
  250. package/src/queues/utils.ts +18 -0
  251. package/src/r2/constants.ts +4 -0
  252. package/src/r2/helpers.ts +132 -0
  253. package/src/r2/index.ts +289 -0
  254. package/src/routes.ts +140 -0
  255. package/src/secret/index.ts +377 -0
  256. package/src/selfsigned.d.ts +23 -23
  257. package/src/sites.ts +484 -0
  258. package/src/tail/createTail.ts +415 -0
  259. package/src/tail/filters.ts +109 -111
  260. package/src/tail/index.ts +208 -296
  261. package/src/tail/printing.ts +116 -51
  262. package/src/traverse-module-graph.ts +54 -0
  263. package/src/tsconfig-sanity.ts +16 -0
  264. package/src/type-generation.ts +181 -0
  265. package/src/update-check.ts +11 -11
  266. package/src/user/access.ts +68 -0
  267. package/src/user/auth-variables.ts +113 -0
  268. package/src/user/choose-account.tsx +39 -0
  269. package/src/user/generate-auth-url.ts +33 -0
  270. package/src/user/generate-random-state.ts +16 -0
  271. package/src/user/index.ts +2 -0
  272. package/src/user/user.ts +1234 -0
  273. package/src/utils/collectKeyValues.ts +14 -0
  274. package/src/utils/render.ts +93 -0
  275. package/src/whoami.ts +135 -0
  276. package/src/worker.ts +205 -107
  277. package/src/yargs-types.ts +37 -0
  278. package/src/zones.ts +158 -40
  279. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  280. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  281. package/templates/__tests__/tsconfig.json +8 -0
  282. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  283. package/templates/checked-fetch.js +23 -0
  284. package/templates/d1-beta-facade.js +244 -0
  285. package/templates/facade.d.ts +14 -0
  286. package/templates/first-party-worker-module-facade.ts +19 -0
  287. package/templates/format-dev-errors.ts +34 -0
  288. package/templates/gitignore +1 -0
  289. package/templates/init-tests/test-jest-new-worker.js +23 -0
  290. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  291. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  292. package/templates/middleware/common.ts +62 -0
  293. package/templates/middleware/loader-modules.ts +84 -0
  294. package/templates/middleware/loader-sw.ts +233 -0
  295. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  296. package/templates/middleware/middleware-pretty-error.ts +40 -0
  297. package/templates/middleware/middleware-scheduled.ts +15 -0
  298. package/templates/new-worker-scheduled.js +3 -3
  299. package/templates/new-worker-scheduled.ts +15 -15
  300. package/templates/new-worker.js +3 -3
  301. package/templates/new-worker.ts +18 -15
  302. package/templates/no-op-worker.js +10 -0
  303. package/templates/pages-dev-pipeline.ts +31 -0
  304. package/templates/pages-dev-util.ts +52 -0
  305. package/templates/pages-shim.ts +12 -0
  306. package/templates/pages-template-plugin.ts +180 -0
  307. package/templates/pages-template-worker.ts +189 -0
  308. package/templates/serve-static-assets.ts +66 -0
  309. package/templates/service-bindings-module-facade.js +55 -0
  310. package/templates/service-bindings-sw-facade.js +42 -0
  311. package/templates/tsconfig-sanity.ts +11 -0
  312. package/templates/tsconfig.init.json +105 -0
  313. package/templates/tsconfig.json +6 -103
  314. package/templates/tsconfig.tsbuildinfo +1 -0
  315. package/wrangler-dist/cli.d.ts +1652 -0
  316. package/wrangler-dist/cli.js +139094 -111923
  317. package/wrangler-dist/wasm-sync.wasm +0 -0
  318. package/pages/functions/buildPlugin.ts +0 -105
  319. package/pages/functions/buildWorker.ts +0 -151
  320. package/pages/functions/filepath-routing.ts +0 -189
  321. package/pages/functions/identifiers.ts +0 -78
  322. package/pages/functions/routes.ts +0 -156
  323. package/pages/functions/template-plugin.ts +0 -147
  324. package/pages/functions/template-worker.ts +0 -143
  325. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  326. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  327. package/src/__tests__/pages.test.ts +0 -754
  328. package/src/dialogs.tsx +0 -135
  329. package/src/environment-variables.ts +0 -35
  330. package/src/index.tsx +0 -2859
  331. package/src/kv.ts +0 -408
  332. package/src/miniflare-cli/enum-keys.ts +0 -17
  333. package/src/pages.tsx +0 -2093
  334. package/src/publish.ts +0 -721
  335. package/src/r2.ts +0 -50
  336. package/src/sites.tsx +0 -326
  337. package/src/user.tsx +0 -1214
  338. package/src/whoami.tsx +0 -71
  339. package/templates/static-asset-facade.js +0 -43
@@ -0,0 +1,433 @@
1
+ import { URLSearchParams } from "node:url";
2
+ import { FormData } from "undici";
3
+ import { fetchListResult, fetchResult, fetchKVGetValue } from "../cfetch";
4
+ import { logger } from "../logger";
5
+ import type { Config } from "../config";
6
+
7
+ /** The largest number of kv items we can pass to the API in a single request. */
8
+ const API_MAX = 10000;
9
+ // The const below are halved from the API's true capacity to help avoid
10
+ // hammering it with large requests.
11
+ export const BATCH_KEY_MAX = API_MAX / 2;
12
+
13
+ type KvArgs = {
14
+ binding?: string;
15
+ "namespace-id"?: string;
16
+ preview?: boolean;
17
+ };
18
+
19
+ /**
20
+ * Create a new namespace under the given `accountId` with the given `title`.
21
+ *
22
+ * @returns the generated id of the created namespace.
23
+ */
24
+ export async function createKVNamespace(
25
+ accountId: string,
26
+ title: string
27
+ ): Promise<string> {
28
+ const response = await fetchResult<{ id: string }>(
29
+ `/accounts/${accountId}/storage/kv/namespaces`,
30
+ {
31
+ method: "POST",
32
+ headers: {
33
+ "Content-Type": "application/json",
34
+ },
35
+ body: JSON.stringify({
36
+ title,
37
+ }),
38
+ }
39
+ );
40
+
41
+ return response.id;
42
+ }
43
+
44
+ /**
45
+ * The information about a namespace that is returned from `listNamespaces()`.
46
+ */
47
+ export interface KVNamespaceInfo {
48
+ id: string;
49
+ title: string;
50
+ supports_url_encoding?: boolean;
51
+ }
52
+
53
+ /**
54
+ * Fetch a list of all the namespaces under the given `accountId`.
55
+ */
56
+ export async function listKVNamespaces(
57
+ accountId: string
58
+ ): Promise<KVNamespaceInfo[]> {
59
+ const pageSize = 100;
60
+ let page = 1;
61
+ const results: KVNamespaceInfo[] = [];
62
+ while (results.length % pageSize === 0) {
63
+ const json = await fetchResult<KVNamespaceInfo[]>(
64
+ `/accounts/${accountId}/storage/kv/namespaces`,
65
+ {},
66
+ new URLSearchParams({
67
+ per_page: pageSize.toString(),
68
+ order: "title",
69
+ direction: "asc",
70
+ page: page.toString(),
71
+ })
72
+ );
73
+ page++;
74
+ results.push(...json);
75
+ if (json.length < pageSize) {
76
+ break;
77
+ }
78
+ }
79
+ return results;
80
+ }
81
+
82
+ export interface NamespaceKeyInfo {
83
+ name: string;
84
+ expiration?: number;
85
+ metadata?: { [key: string]: unknown };
86
+ }
87
+
88
+ export async function listKVNamespaceKeys(
89
+ accountId: string,
90
+ namespaceId: string,
91
+ prefix = ""
92
+ ) {
93
+ return await fetchListResult<NamespaceKeyInfo>(
94
+ `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/keys`,
95
+ {},
96
+ new URLSearchParams({ prefix })
97
+ );
98
+ }
99
+
100
+ export async function deleteKVNamespace(
101
+ accountId: string,
102
+ namespaceId: string
103
+ ) {
104
+ return await fetchResult<{ id: string }>(
105
+ `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}`,
106
+ { method: "DELETE" }
107
+ );
108
+ }
109
+
110
+ /**
111
+ * Information about a key-value pair, including its "metadata" fields.
112
+ */
113
+ export interface KeyValue {
114
+ key: string;
115
+ value: string | Buffer;
116
+ expiration?: number;
117
+ expiration_ttl?: number;
118
+ metadata?: object;
119
+ base64?: boolean;
120
+ }
121
+
122
+ const KeyValueKeys = new Set([
123
+ "key",
124
+ "value",
125
+ "expiration",
126
+ "expiration_ttl",
127
+ "metadata",
128
+ "base64",
129
+ ]);
130
+
131
+ /**
132
+ * The object has the specified property.
133
+ */
134
+ function hasProperty<T extends object>(
135
+ obj: object,
136
+ property: keyof T
137
+ ): obj is T {
138
+ return property in obj;
139
+ }
140
+
141
+ /**
142
+ * The object has a required property of the specified type.
143
+ */
144
+ function hasTypedProperty<T extends object>(
145
+ obj: object,
146
+ property: keyof T,
147
+ type: string
148
+ ): obj is T {
149
+ return hasProperty(obj, property) && typeof obj[property] === type;
150
+ }
151
+
152
+ /**
153
+ * The object an optional property, of the specified type.
154
+ */
155
+ function hasOptionalTypedProperty<T extends object>(
156
+ obj: object,
157
+ property: keyof T,
158
+ type: string
159
+ ): obj is Omit<T, typeof property> | T {
160
+ return !hasProperty(obj, property) || typeof obj[property] === type;
161
+ }
162
+
163
+ /**
164
+ * Is the given object a valid `KeyValue` type?
165
+ */
166
+ export function isKVKeyValue(keyValue: unknown): keyValue is KeyValue {
167
+ if (
168
+ keyValue === null ||
169
+ typeof keyValue !== "object" ||
170
+ !hasTypedProperty(keyValue, "key", "string") ||
171
+ !hasTypedProperty(keyValue, "value", "string") ||
172
+ !hasOptionalTypedProperty(keyValue, "expiration", "number") ||
173
+ !hasOptionalTypedProperty(keyValue, "expiration_ttl", "number") ||
174
+ !hasOptionalTypedProperty(keyValue, "base64", "boolean") ||
175
+ !hasOptionalTypedProperty(keyValue, "metadata", "object")
176
+ ) {
177
+ return false;
178
+ }
179
+ return true;
180
+ }
181
+
182
+ /**
183
+ * Get all the properties on the `keyValue` that are not expected.
184
+ */
185
+ export function unexpectedKVKeyValueProps(keyValue: KeyValue): string[] {
186
+ const props = Object.keys(keyValue);
187
+ return props.filter((prop) => !KeyValueKeys.has(prop));
188
+ }
189
+
190
+ /**
191
+ * Turn object with fields into FormData
192
+ */
193
+ function asFormData(fields: Record<string, unknown>): FormData {
194
+ const formData = new FormData();
195
+
196
+ for (const [name, value] of Object.entries(fields)) {
197
+ formData.append(name, value);
198
+ }
199
+
200
+ return formData;
201
+ }
202
+
203
+ export async function putKVKeyValue(
204
+ accountId: string,
205
+ namespaceId: string,
206
+ keyValue: KeyValue
207
+ ) {
208
+ let searchParams: URLSearchParams | undefined;
209
+ if (keyValue.expiration || keyValue.expiration_ttl) {
210
+ searchParams = new URLSearchParams();
211
+ if (keyValue.expiration) {
212
+ searchParams.set("expiration", `${keyValue.expiration}`);
213
+ }
214
+ if (keyValue.expiration_ttl) {
215
+ searchParams.set("expiration_ttl", `${keyValue.expiration_ttl}`);
216
+ }
217
+ }
218
+ return await fetchResult(
219
+ `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(
220
+ keyValue.key
221
+ )}`,
222
+ {
223
+ method: "PUT",
224
+ body: keyValue.metadata
225
+ ? asFormData({
226
+ value: keyValue.value,
227
+ metadata: JSON.stringify(keyValue.metadata),
228
+ })
229
+ : keyValue.value,
230
+ },
231
+ searchParams
232
+ );
233
+ }
234
+
235
+ export async function getKVKeyValue(
236
+ accountId: string,
237
+ namespaceId: string,
238
+ key: string
239
+ ): Promise<ArrayBuffer> {
240
+ return await fetchKVGetValue(accountId, namespaceId, encodeURIComponent(key));
241
+ }
242
+
243
+ export async function deleteKVKeyValue(
244
+ accountId: string,
245
+ namespaceId: string,
246
+ key: string
247
+ ) {
248
+ return await fetchResult(
249
+ `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(
250
+ key
251
+ )}`,
252
+ { method: "DELETE" }
253
+ );
254
+ }
255
+
256
+ /**
257
+ * Formatter for converting e.g. 5328 --> 5,328
258
+ */
259
+ export const formatNumber = new Intl.NumberFormat("en-US", {
260
+ notation: "standard",
261
+ }).format;
262
+
263
+ /**
264
+ * Helper function for bulk requests, logs ongoing output to console.
265
+ */
266
+ function logBulkProgress(
267
+ operation: "put" | "delete",
268
+ index: number,
269
+ total: number
270
+ ) {
271
+ logger.log(
272
+ `${operation === "put" ? "Uploaded" : "Deleted"} ${Math.floor(
273
+ (100 * index) / total
274
+ )}% (${formatNumber(index)} out of ${formatNumber(total)})`
275
+ );
276
+ }
277
+
278
+ export async function putKVBulkKeyValue(
279
+ accountId: string,
280
+ namespaceId: string,
281
+ keyValues: KeyValue[],
282
+ quiet = false,
283
+ abortSignal?: AbortSignal
284
+ ) {
285
+ for (let index = 0; index < keyValues.length; index += BATCH_KEY_MAX) {
286
+ if (!quiet && keyValues.length > BATCH_KEY_MAX) {
287
+ logBulkProgress("put", index, keyValues.length);
288
+ }
289
+
290
+ await fetchResult(
291
+ `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/bulk`,
292
+ {
293
+ method: "PUT",
294
+ body: JSON.stringify(keyValues.slice(index, index + BATCH_KEY_MAX)),
295
+ headers: { "Content-Type": "application/json" },
296
+ },
297
+ undefined,
298
+ abortSignal
299
+ );
300
+ }
301
+
302
+ if (!quiet && keyValues.length > BATCH_KEY_MAX) {
303
+ logBulkProgress("put", keyValues.length, keyValues.length);
304
+ }
305
+ }
306
+
307
+ export async function deleteKVBulkKeyValue(
308
+ accountId: string,
309
+ namespaceId: string,
310
+ keys: string[],
311
+ quiet = false
312
+ ) {
313
+ for (let index = 0; index < keys.length; index += BATCH_KEY_MAX) {
314
+ if (!quiet && keys.length > BATCH_KEY_MAX) {
315
+ logBulkProgress("delete", index, keys.length);
316
+ }
317
+
318
+ await fetchResult(
319
+ `/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/bulk`,
320
+ {
321
+ method: "DELETE",
322
+ body: JSON.stringify(keys.slice(index, index + BATCH_KEY_MAX)),
323
+ headers: { "Content-Type": "application/json" },
324
+ }
325
+ );
326
+ }
327
+ if (!quiet && keys.length > BATCH_KEY_MAX) {
328
+ logBulkProgress("delete", keys.length, keys.length);
329
+ }
330
+ }
331
+
332
+ export function getKVNamespaceId(
333
+ { preview, binding, "namespace-id": namespaceId }: KvArgs,
334
+ config: Config
335
+ ): string {
336
+ // nice
337
+ if (namespaceId) {
338
+ return namespaceId;
339
+ }
340
+
341
+ // begin pre-flight checks
342
+
343
+ // `--binding` is only valid if there's a wrangler configuration.
344
+ if (binding && !config) {
345
+ throw new Error("--binding specified, but no config file was found.");
346
+ }
347
+
348
+ // there's no config. abort here
349
+ if (!config) {
350
+ throw new Error(
351
+ "Failed to find a config file.\n" +
352
+ "Either use --namespace-id to upload directly or create a configuration file with a binding."
353
+ );
354
+ }
355
+
356
+ // there's no KV namespaces
357
+ if (!config.kv_namespaces || config.kv_namespaces.length === 0) {
358
+ throw new Error(
359
+ "No KV Namespaces configured! Either use --namespace-id to upload directly or add a KV namespace to your wrangler config file."
360
+ );
361
+ }
362
+
363
+ const namespace = config.kv_namespaces.find((ns) => ns.binding === binding);
364
+
365
+ // we couldn't find a namespace with that binding
366
+ if (!namespace) {
367
+ throw new Error(
368
+ `A namespace with binding name "${binding}" was not found in the configured "kv_namespaces".`
369
+ );
370
+ }
371
+
372
+ // end pre-flight checks
373
+
374
+ // we're in preview mode, `--preview true` or `--preview` was passed
375
+ if (preview && namespace.preview_id) {
376
+ namespaceId = namespace.preview_id;
377
+ // We don't want to execute code below if preview is set to true, so we just return. Otherwise we will get errors!
378
+ return namespaceId;
379
+ } else if (preview) {
380
+ throw new Error(
381
+ `No preview ID found for ${binding}. Add one to your wrangler config file to use a separate namespace for previewing your worker.`
382
+ );
383
+ }
384
+
385
+ // either `--preview false`, or preview wasn't passed
386
+ // TODO: should we care? or should we just treat false and undefined the same
387
+ const previewIsDefined = typeof preview !== "undefined";
388
+
389
+ // --preview false was passed
390
+ if (previewIsDefined && namespace.id) {
391
+ namespaceId = namespace.id;
392
+ // We don't want to execute code below if preview is set to true, so we just return. Otherwise we can get error!
393
+ return namespaceId;
394
+ } else if (previewIsDefined) {
395
+ throw new Error(
396
+ `No namespace ID found for ${binding}. Add one to your wrangler config file to use a separate namespace for previewing your worker.`
397
+ );
398
+ }
399
+
400
+ // `--preview` wasn't passed
401
+ const bindingHasOnlyOneId =
402
+ (namespace.id && !namespace.preview_id) ||
403
+ (!namespace.id && namespace.preview_id);
404
+ if (bindingHasOnlyOneId) {
405
+ namespaceId = namespace.id || namespace.preview_id;
406
+ } else {
407
+ throw new Error(
408
+ `${binding} has both a namespace ID and a preview ID. Specify "--preview" or "--preview false" to avoid writing data to the wrong namespace.`
409
+ );
410
+ }
411
+
412
+ // shouldn't happen. we should be able to prove this with strong typing.
413
+ // TODO: when we add strongly typed commands, rewrite these checks so they're exhaustive
414
+ if (!namespaceId) {
415
+ throw Error(
416
+ "Something went wrong trying to determine which namespace to upload to.\n" +
417
+ "Please create a github issue with the command you just ran along with your wrangler configuration."
418
+ );
419
+ }
420
+
421
+ return namespaceId;
422
+ }
423
+
424
+ /**
425
+ * KV namespace binding names must be valid JS identifiers.
426
+ */
427
+ export function isValidKVNamespaceBinding(
428
+ binding: string | undefined
429
+ ): binding is string {
430
+ return (
431
+ typeof binding === "string" && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(binding)
432
+ );
433
+ }