wrangler 0.0.0-e87ad068 → 0.0.0-e8df68ee

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 (313) hide show
  1. package/README.md +5 -7
  2. package/bin/wrangler.js +9 -75
  3. package/package.json +13 -17
  4. package/templates/__tests__/tsconfig.json +1 -1
  5. package/templates/checked-fetch.js +1 -1
  6. package/templates/facade.d.ts +4 -1
  7. package/templates/middleware/common.ts +9 -4
  8. package/templates/middleware/loader-modules.ts +52 -9
  9. package/templates/middleware/loader-sw.ts +2 -7
  10. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  11. package/templates/{d1-beta-facade.js → middleware/middleware-d1-beta.ts} +85 -85
  12. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  13. package/templates/middleware/middleware-multiworker-dev.ts +59 -0
  14. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  15. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  16. package/templates/new-worker-scheduled.ts +1 -1
  17. package/templates/new-worker.ts +1 -1
  18. package/templates/pages-shim.ts +0 -3
  19. package/templates/pages-template-plugin.ts +12 -2
  20. package/templates/pages-template-worker.ts +11 -2
  21. package/templates/tsconfig.json +1 -1
  22. package/wrangler-dist/cli.d.ts +83 -74
  23. package/wrangler-dist/cli.js +15669 -20172
  24. package/import_meta_url.js +0 -3
  25. package/miniflare-config-stubs/.env.empty +0 -0
  26. package/miniflare-config-stubs/package.empty.json +0 -1
  27. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  28. package/miniflare-dist/index.mjs +0 -6442
  29. package/src/__tests__/access.test.ts +0 -25
  30. package/src/__tests__/api-dev.test.ts +0 -238
  31. package/src/__tests__/api-devregistry.test.ts +0 -121
  32. package/src/__tests__/api.test.ts +0 -102
  33. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  34. package/src/__tests__/config-cache.test.ts +0 -42
  35. package/src/__tests__/configuration.test.ts +0 -4727
  36. package/src/__tests__/constellation.test.ts +0 -371
  37. package/src/__tests__/d1/d1.test.ts +0 -82
  38. package/src/__tests__/d1/execute.test.ts +0 -66
  39. package/src/__tests__/d1/migrate.test.ts +0 -257
  40. package/src/__tests__/d1/splitter.test.ts +0 -255
  41. package/src/__tests__/delete.test.ts +0 -272
  42. package/src/__tests__/deployments.test.ts +0 -369
  43. package/src/__tests__/dev.test.tsx +0 -1617
  44. package/src/__tests__/generate.test.ts +0 -237
  45. package/src/__tests__/get-host-from-url.test.ts +0 -16
  46. package/src/__tests__/guess-worker-format.test.ts +0 -120
  47. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  48. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  49. package/src/__tests__/helpers/end-event-loop.ts +0 -6
  50. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  51. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  52. package/src/__tests__/helpers/mock-bin.ts +0 -36
  53. package/src/__tests__/helpers/mock-console.ts +0 -112
  54. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  55. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  56. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  57. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  58. package/src/__tests__/helpers/mock-istty.ts +0 -74
  59. package/src/__tests__/helpers/mock-known-routes.ts +0 -12
  60. package/src/__tests__/helpers/mock-kv.ts +0 -46
  61. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  62. package/src/__tests__/helpers/mock-process.ts +0 -34
  63. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  64. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  65. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  66. package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
  67. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  68. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -160
  69. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  70. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  71. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  72. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  73. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  74. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  75. package/src/__tests__/helpers/msw/index.ts +0 -52
  76. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  77. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  78. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  79. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  80. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  81. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  82. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  83. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -11
  84. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  85. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  86. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  87. package/src/__tests__/https-options.test.ts +0 -163
  88. package/src/__tests__/index.test.ts +0 -282
  89. package/src/__tests__/init.test.ts +0 -3302
  90. package/src/__tests__/jest.setup.ts +0 -179
  91. package/src/__tests__/kv.test.ts +0 -1799
  92. package/src/__tests__/logger.test.ts +0 -207
  93. package/src/__tests__/logout.test.ts +0 -47
  94. package/src/__tests__/metrics.test.ts +0 -493
  95. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  96. package/src/__tests__/middleware.test.ts +0 -816
  97. package/src/__tests__/mtls-certificates.test.ts +0 -589
  98. package/src/__tests__/package-manager.test.ts +0 -353
  99. package/src/__tests__/pages/deployment-list.test.ts +0 -80
  100. package/src/__tests__/pages/functions-build.test.ts +0 -529
  101. package/src/__tests__/pages/pages.test.ts +0 -81
  102. package/src/__tests__/pages/project-create.test.ts +0 -63
  103. package/src/__tests__/pages/project-list.test.ts +0 -110
  104. package/src/__tests__/pages/project-upload.test.ts +0 -500
  105. package/src/__tests__/pages/publish.test.ts +0 -2864
  106. package/src/__tests__/pages-deployment-tail.test.ts +0 -957
  107. package/src/__tests__/parse.test.ts +0 -436
  108. package/src/__tests__/paths.test.ts +0 -39
  109. package/src/__tests__/publish.test.ts +0 -8882
  110. package/src/__tests__/pubsub.test.ts +0 -496
  111. package/src/__tests__/queues.test.ts +0 -532
  112. package/src/__tests__/r2.test.ts +0 -374
  113. package/src/__tests__/route.test.ts +0 -45
  114. package/src/__tests__/secret.test.ts +0 -693
  115. package/src/__tests__/tail.test.ts +0 -1000
  116. package/src/__tests__/test-old-node-version.js +0 -31
  117. package/src/__tests__/traverse-module-graph.test.ts +0 -220
  118. package/src/__tests__/tsconfig-sanity.ts +0 -12
  119. package/src/__tests__/tsconfig.json +0 -8
  120. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  121. package/src/__tests__/type-generation.test.ts +0 -234
  122. package/src/__tests__/unstableDev.test.ts +0 -61
  123. package/src/__tests__/user.test.ts +0 -118
  124. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  125. package/src/__tests__/validate-dev-props.test.ts +0 -56
  126. package/src/__tests__/version.test.ts +0 -35
  127. package/src/__tests__/whoami.test.tsx +0 -172
  128. package/src/__tests__/worker-namespace.test.ts +0 -340
  129. package/src/abort.d.ts +0 -3
  130. package/src/api/dev.ts +0 -328
  131. package/src/api/index.ts +0 -11
  132. package/src/api/mtls-certificate.ts +0 -148
  133. package/src/api/pages/create-worker-bundle-contents.ts +0 -80
  134. package/src/api/pages/index.ts +0 -5
  135. package/src/api/pages/publish.tsx +0 -371
  136. package/src/bundle-reporter.ts +0 -68
  137. package/src/bundle.ts +0 -952
  138. package/src/cfetch/index.ts +0 -158
  139. package/src/cfetch/internal.ts +0 -263
  140. package/src/cli.ts +0 -28
  141. package/src/config/README.md +0 -107
  142. package/src/config/config.ts +0 -282
  143. package/src/config/diagnostics.ts +0 -80
  144. package/src/config/environment.ts +0 -659
  145. package/src/config/index.ts +0 -424
  146. package/src/config/validation-helpers.ts +0 -597
  147. package/src/config/validation.ts +0 -2524
  148. package/src/config-cache.ts +0 -85
  149. package/src/constellation/createProject.tsx +0 -51
  150. package/src/constellation/deleteProject.ts +0 -51
  151. package/src/constellation/deleteProjectModel.ts +0 -76
  152. package/src/constellation/index.ts +0 -75
  153. package/src/constellation/listCatalog.tsx +0 -35
  154. package/src/constellation/listModel.tsx +0 -49
  155. package/src/constellation/listProject.tsx +0 -28
  156. package/src/constellation/listRuntime.tsx +0 -28
  157. package/src/constellation/options.ts +0 -17
  158. package/src/constellation/types.ts +0 -17
  159. package/src/constellation/uploadModel.tsx +0 -84
  160. package/src/constellation/utils.ts +0 -90
  161. package/src/create-worker-preview.ts +0 -293
  162. package/src/create-worker-upload-form.ts +0 -384
  163. package/src/d1/backups.tsx +0 -219
  164. package/src/d1/constants.ts +0 -5
  165. package/src/d1/create.tsx +0 -102
  166. package/src/d1/delete.ts +0 -53
  167. package/src/d1/execute.tsx +0 -371
  168. package/src/d1/formatTimeAgo.ts +0 -14
  169. package/src/d1/index.ts +0 -100
  170. package/src/d1/list.tsx +0 -62
  171. package/src/d1/migrations/apply.tsx +0 -235
  172. package/src/d1/migrations/create.tsx +0 -79
  173. package/src/d1/migrations/helpers.ts +0 -171
  174. package/src/d1/migrations/index.ts +0 -3
  175. package/src/d1/migrations/list.tsx +0 -95
  176. package/src/d1/migrations/options.ts +0 -23
  177. package/src/d1/options.ts +0 -22
  178. package/src/d1/splitter.ts +0 -161
  179. package/src/d1/types.ts +0 -32
  180. package/src/d1/utils.ts +0 -49
  181. package/src/delete.ts +0 -100
  182. package/src/deployments.ts +0 -368
  183. package/src/deprecated/index.ts +0 -144
  184. package/src/dev/dev-vars.ts +0 -39
  185. package/src/dev/dev.tsx +0 -607
  186. package/src/dev/get-local-persistence-path.ts +0 -31
  187. package/src/dev/local.tsx +0 -952
  188. package/src/dev/remote.tsx +0 -636
  189. package/src/dev/start-server.ts +0 -558
  190. package/src/dev/use-esbuild.ts +0 -230
  191. package/src/dev/validate-dev-props.ts +0 -40
  192. package/src/dev-registry.ts +0 -213
  193. package/src/dev.tsx +0 -946
  194. package/src/dialogs.ts +0 -136
  195. package/src/dispatch-namespace.ts +0 -211
  196. package/src/docs/helpers.ts +0 -50
  197. package/src/docs/index.ts +0 -54
  198. package/src/durable.ts +0 -102
  199. package/src/entry.ts +0 -344
  200. package/src/environment-variables/factory.ts +0 -89
  201. package/src/environment-variables/misc-variables.ts +0 -30
  202. package/src/errors.ts +0 -11
  203. package/src/generate/index.ts +0 -303
  204. package/src/git-client.ts +0 -135
  205. package/src/global-wrangler-config-path.ts +0 -26
  206. package/src/https-options.ts +0 -127
  207. package/src/index.ts +0 -769
  208. package/src/init.ts +0 -1074
  209. package/src/inspect.ts +0 -883
  210. package/src/intl-polyfill.d.ts +0 -139
  211. package/src/is-ci.ts +0 -14
  212. package/src/is-interactive.ts +0 -16
  213. package/src/jest.d.ts +0 -4
  214. package/src/kv/helpers.ts +0 -433
  215. package/src/kv/index.ts +0 -594
  216. package/src/logger.ts +0 -123
  217. package/src/metrics/index.ts +0 -5
  218. package/src/metrics/metrics-config.ts +0 -239
  219. package/src/metrics/metrics-dispatcher.ts +0 -96
  220. package/src/metrics/metrics-usage-headers.ts +0 -24
  221. package/src/metrics/send-event.ts +0 -99
  222. package/src/miniflare-cli/README.md +0 -30
  223. package/src/miniflare-cli/assets.ts +0 -251
  224. package/src/miniflare-cli/index.ts +0 -210
  225. package/src/miniflare-cli/request-context.ts +0 -40
  226. package/src/miniflare-cli/tsconfig.json +0 -9
  227. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  228. package/src/miniflare-cli/types.ts +0 -11
  229. package/src/module-collection.ts +0 -333
  230. package/src/mtls-certificate/cli.ts +0 -155
  231. package/src/open-in-browser.ts +0 -17
  232. package/src/package-manager.ts +0 -219
  233. package/src/pages/build.ts +0 -423
  234. package/src/pages/buildFunctions.ts +0 -140
  235. package/src/pages/constants.ts +0 -18
  236. package/src/pages/deployment-tails.ts +0 -281
  237. package/src/pages/deployments.tsx +0 -84
  238. package/src/pages/dev.ts +0 -759
  239. package/src/pages/errors.ts +0 -67
  240. package/src/pages/functions/buildPlugin.ts +0 -114
  241. package/src/pages/functions/buildWorker.ts +0 -381
  242. package/src/pages/functions/filepath-routing.test.ts +0 -234
  243. package/src/pages/functions/filepath-routing.ts +0 -189
  244. package/src/pages/functions/identifiers.ts +0 -78
  245. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  246. package/src/pages/functions/routes-consolidation.ts +0 -73
  247. package/src/pages/functions/routes-transformation.test.ts +0 -282
  248. package/src/pages/functions/routes-transformation.ts +0 -115
  249. package/src/pages/functions/routes-validation.test.ts +0 -403
  250. package/src/pages/functions/routes-validation.ts +0 -202
  251. package/src/pages/functions/routes.ts +0 -151
  252. package/src/pages/functions/tsconfig.json +0 -8
  253. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  254. package/src/pages/functions.ts +0 -86
  255. package/src/pages/hash.ts +0 -13
  256. package/src/pages/index.ts +0 -102
  257. package/src/pages/projects.tsx +0 -159
  258. package/src/pages/prompt-select-project.tsx +0 -31
  259. package/src/pages/publish.tsx +0 -267
  260. package/src/pages/types.ts +0 -46
  261. package/src/pages/upload.tsx +0 -469
  262. package/src/pages/utils.ts +0 -23
  263. package/src/parse.ts +0 -308
  264. package/src/paths.ts +0 -71
  265. package/src/proxy.ts +0 -694
  266. package/src/publish/index.ts +0 -274
  267. package/src/publish/publish.ts +0 -1068
  268. package/src/pubsub/index.ts +0 -286
  269. package/src/pubsub/pubsub-commands.ts +0 -623
  270. package/src/queues/cli/commands/consumer/add.ts +0 -71
  271. package/src/queues/cli/commands/consumer/index.ts +0 -19
  272. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  273. package/src/queues/cli/commands/create.ts +0 -25
  274. package/src/queues/cli/commands/delete.ts +0 -26
  275. package/src/queues/cli/commands/index.ts +0 -35
  276. package/src/queues/cli/commands/list.ts +0 -25
  277. package/src/queues/client.ts +0 -136
  278. package/src/queues/utils.ts +0 -18
  279. package/src/r2/constants.ts +0 -4
  280. package/src/r2/helpers.ts +0 -132
  281. package/src/r2/index.ts +0 -289
  282. package/src/routes.ts +0 -140
  283. package/src/secret/index.ts +0 -380
  284. package/src/selfsigned.d.ts +0 -29
  285. package/src/sites.ts +0 -484
  286. package/src/tail/createTail.ts +0 -415
  287. package/src/tail/filters.ts +0 -277
  288. package/src/tail/index.ts +0 -211
  289. package/src/tail/printing.ts +0 -134
  290. package/src/traverse-module-graph.ts +0 -54
  291. package/src/tsconfig-sanity.ts +0 -16
  292. package/src/type-generation.ts +0 -187
  293. package/src/update-check.ts +0 -19
  294. package/src/user/access.ts +0 -68
  295. package/src/user/auth-variables.ts +0 -113
  296. package/src/user/choose-account.tsx +0 -39
  297. package/src/user/generate-auth-url.ts +0 -33
  298. package/src/user/generate-random-state.ts +0 -16
  299. package/src/user/index.ts +0 -2
  300. package/src/user/user.ts +0 -1234
  301. package/src/utils/collectKeyValues.ts +0 -14
  302. package/src/utils/render.ts +0 -93
  303. package/src/whoami.ts +0 -135
  304. package/src/worker.ts +0 -300
  305. package/src/yargs-types.ts +0 -37
  306. package/src/zones.ts +0 -191
  307. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  308. package/templates/first-party-worker-module-facade.ts +0 -19
  309. package/templates/format-dev-errors.ts +0 -34
  310. package/templates/serve-static-assets.ts +0 -66
  311. package/templates/service-bindings-module-facade.js +0 -55
  312. package/templates/service-bindings-sw-facade.js +0 -42
  313. package/templates/tsconfig.tsbuildinfo +0 -1
package/src/sites.ts DELETED
@@ -1,484 +0,0 @@
1
- import assert from "node:assert";
2
- import { readdir, readFile, stat } from "node:fs/promises";
3
- import * as path from "node:path";
4
- import chalk from "chalk";
5
- import ignore from "ignore";
6
- import xxhash from "xxhash-wasm";
7
- import {
8
- createKVNamespace,
9
- listKVNamespaceKeys,
10
- listKVNamespaces,
11
- putKVBulkKeyValue,
12
- deleteKVBulkKeyValue,
13
- BATCH_KEY_MAX,
14
- formatNumber,
15
- } from "./kv/helpers";
16
- import { logger, LOGGER_LEVELS } from "./logger";
17
- import type { Config } from "./config";
18
- import type { KeyValue } from "./kv/helpers";
19
- import type { XXHashAPI } from "xxhash-wasm";
20
-
21
- /** Paths to always ignore. */
22
- const ALWAYS_IGNORE = new Set(["node_modules"]);
23
- const HIDDEN_FILES_TO_INCLUDE = new Set([
24
- ".well-known", // See https://datatracker.ietf.org/doc/html/rfc8615
25
- ]);
26
-
27
- async function* getFilesInFolder(dirPath: string): AsyncIterable<string> {
28
- const files = await readdir(dirPath, { withFileTypes: true });
29
- for (const file of files) {
30
- // Skip files that we never want to process.
31
- if (ALWAYS_IGNORE.has(file.name)) {
32
- continue;
33
- }
34
- // Skip hidden files (starting with .) except for some special ones
35
- if (file.name.startsWith(".") && !HIDDEN_FILES_TO_INCLUDE.has(file.name)) {
36
- continue;
37
- }
38
- // TODO: follow symlinks??
39
- if (file.isDirectory()) {
40
- yield* await getFilesInFolder(path.join(dirPath, file.name));
41
- } else {
42
- yield path.join(dirPath, file.name);
43
- }
44
- }
45
- }
46
-
47
- /**
48
- * Create a hash key for the given content using the xxhash algorithm.
49
- *
50
- * Note we only return the first 10 characters, since we will also include the file name in the asset manifest key
51
- * the most important thing here is to detect changes of a single file to invalidate the cache and
52
- * it's impossible to serve two different files with the same name
53
- */
54
- function hashFileContent(hasher: XXHashAPI, content: string): string {
55
- return hasher.h64ToString(content).substring(0, 10);
56
- }
57
-
58
- /**
59
- * Create a hashed asset key for the given asset.
60
- *
61
- * The key will change if the file path or content of the asset changes.
62
- * The algorithm used here matches that of Wrangler v1.
63
- */
64
- function hashAsset(
65
- hasher: XXHashAPI,
66
- filePath: string,
67
- content: string
68
- ): string {
69
- const extName = path.extname(filePath) || "";
70
- const baseName = path.basename(filePath, extName);
71
- const directory = path.dirname(filePath);
72
- const hash = hashFileContent(hasher, content);
73
- return urlSafe(path.join(directory, `${baseName}.${hash}${extName}`));
74
- }
75
-
76
- async function createKVNamespaceIfNotAlreadyExisting(
77
- title: string,
78
- accountId: string
79
- ) {
80
- // check if it already exists
81
- // TODO: this is super inefficient, should be made better
82
- const namespaces = await listKVNamespaces(accountId);
83
- const found = namespaces.find((ns) => ns.title === title);
84
- if (found) {
85
- return { created: false, id: found.id };
86
- }
87
-
88
- // else we make the namespace
89
- const id = await createKVNamespace(accountId, title);
90
- logger.log(`🌀 Created namespace for Workers Site "${title}"`);
91
-
92
- return {
93
- created: true,
94
- id,
95
- };
96
- }
97
-
98
- const MAX_DIFF_LINES = 100;
99
- const MAX_BUCKET_SIZE = 98 * 1000 * 1000;
100
- const MAX_BUCKET_KEYS = BATCH_KEY_MAX;
101
- const MAX_BATCH_OPERATIONS = 5;
102
-
103
- function pluralise(count: number) {
104
- return count === 1 ? "" : "s";
105
- }
106
-
107
- /**
108
- * Upload the assets found within the `dirPath` directory to the sites assets KV namespace for
109
- * the worker given by `scriptName`.
110
- *
111
- * @param accountId the account to upload to.
112
- * @param scriptName the name of the worker whose assets we are uploading.
113
- * @param siteAssets an objects describing what assets to upload, or undefined if there are no assets to upload.
114
- * @param preview if true then upload to a "preview" KV namespace.
115
- * @returns a promise for an object mapping the relative paths of the assets to the key of that
116
- * asset in the KV namespace.
117
- */
118
- export async function syncAssets(
119
- accountId: string | undefined,
120
- scriptName: string,
121
- siteAssets: AssetPaths | undefined,
122
- preview: boolean,
123
- dryRun: boolean | undefined
124
- ): Promise<{
125
- manifest: { [filePath: string]: string } | undefined;
126
- namespace: string | undefined;
127
- }> {
128
- if (siteAssets === undefined) {
129
- return { manifest: undefined, namespace: undefined };
130
- }
131
- if (dryRun) {
132
- logger.log("(Note: doing a dry run, not uploading or deleting anything.)");
133
- return { manifest: undefined, namespace: undefined };
134
- }
135
- assert(accountId, "Missing accountId");
136
-
137
- // Create assets namespace if it doesn't exist
138
- const title = `__${scriptName}-workers_sites_assets${
139
- preview ? "_preview" : ""
140
- }`;
141
-
142
- const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
143
- title,
144
- accountId
145
- );
146
- // Get all existing keys in asset namespace
147
- logger.info("Fetching list of already uploaded assets...");
148
- const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
149
- const namespaceKeys = new Set(namespaceKeysResponse.map((x) => x.name));
150
-
151
- const assetDirectory = path.join(
152
- siteAssets.baseDirectory,
153
- siteAssets.assetDirectory
154
- );
155
- const include = createPatternMatcher(siteAssets.includePatterns, false);
156
- const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
157
- const hasher = await xxhash();
158
-
159
- // Find and validate all assets before we make any changes (can't store base64
160
- // contents in memory for upload as users may have *lots* of files, and we
161
- // don't want to OOM: https://github.com/cloudflare/workers-sdk/issues/2223)
162
-
163
- const manifest: Record<string, string> = {};
164
- type PathKey = [path: string, key: string];
165
- // A batch of uploads where each bucket has to be less than 100 MiB and
166
- // contain less than 10,000 keys (although we limit to 98 MB and 5000 keys)
167
- const uploadBuckets: PathKey[][] = [];
168
- // The "live" bucket we'll keep filling until it's just below the size limit
169
- let uploadBucket: PathKey[] = [];
170
- // Current size of the live bucket in bytes (just base64 encoded values)
171
- let uploadBucketSize = 0;
172
-
173
- let uploadCount = 0;
174
- let skipCount = 0;
175
-
176
- // Always log the first MAX_DIFF_LINES lines, then require the debug log level
177
- let diffCount = 0;
178
- function logDiff(line: string) {
179
- const level = logger.loggerLevel;
180
- if (LOGGER_LEVELS[level] >= LOGGER_LEVELS.debug) {
181
- // If we're logging as debug level, we want *all* diff lines to be logged
182
- // at debug level, not just the first MAX_DIFF_LINES
183
- logger.debug(line);
184
- } else if (diffCount < MAX_DIFF_LINES) {
185
- // Otherwise, log the first MAX_DIFF_LINES diffs at info level...
186
- logger.info(line);
187
- } else if (diffCount === MAX_DIFF_LINES) {
188
- // ...and warn when we start to truncate it
189
- const msg =
190
- " (truncating changed assets log, set `WRANGLER_LOG=debug` environment variable to see full diff)";
191
- logger.info(chalk.dim(msg));
192
- }
193
- diffCount++;
194
- }
195
-
196
- logger.info("Building list of assets to upload...");
197
- for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
198
- const assetFile = path.relative(assetDirectory, absAssetFile);
199
- if (!include(assetFile) || exclude(assetFile)) continue;
200
-
201
- const content = await readFile(absAssetFile, "base64");
202
- // While KV accepts files that are 25 MiB **before** b64 encoding
203
- // the overall bucket size must be below 100 MB **after** b64 encoding
204
- const assetSize = Buffer.byteLength(content);
205
- await validateAssetSize(absAssetFile, assetFile);
206
- const assetKey = hashAsset(hasher, assetFile, content);
207
- validateAssetKey(assetKey);
208
-
209
- if (!namespaceKeys.has(assetKey)) {
210
- logDiff(
211
- chalk.green(` + ${assetKey} (uploading new version of ${assetFile})`)
212
- );
213
-
214
- // Check if adding this asset to the bucket would push it over the KV
215
- // bulk API limits
216
- if (
217
- uploadBucketSize + assetSize > MAX_BUCKET_SIZE ||
218
- uploadBucket.length + 1 > MAX_BUCKET_KEYS
219
- ) {
220
- // If so, record the current bucket and reset it
221
- uploadBuckets.push(uploadBucket);
222
- uploadBucketSize = 0;
223
- uploadBucket = [];
224
- }
225
-
226
- // Update the bucket and the size counter
227
- uploadBucketSize += assetSize;
228
- uploadBucket.push([absAssetFile, assetKey]);
229
- uploadCount++;
230
- } else {
231
- logDiff(chalk.dim(` = ${assetKey} (already uploaded ${assetFile})`));
232
- skipCount++;
233
- }
234
-
235
- // Remove the key from the set so we know what we've already uploaded
236
- namespaceKeys.delete(assetKey);
237
-
238
- // Prevent different manifest keys on windows
239
- const manifestKey = urlSafe(path.relative(assetDirectory, absAssetFile));
240
- manifest[manifestKey] = assetKey;
241
- }
242
- // Add the last (potentially only or empty) bucket to the batch
243
- if (uploadBucket.length > 0) uploadBuckets.push(uploadBucket);
244
-
245
- for (const key of namespaceKeys) {
246
- logDiff(chalk.red(` - ${key} (removing as stale)`));
247
- }
248
-
249
- // Upload new assets, with 5 concurrent uploaders
250
- if (uploadCount > 0) {
251
- const s = pluralise(uploadCount);
252
- logger.info(`Uploading ${formatNumber(uploadCount)} new asset${s}...`);
253
- }
254
- if (skipCount > 0) {
255
- const s = pluralise(skipCount);
256
- logger.info(
257
- `Skipped uploading ${formatNumber(skipCount)} existing asset${s}.`
258
- );
259
- }
260
- let uploadedCount = 0;
261
- const controller = new AbortController();
262
- const uploaders = Array.from(Array(MAX_BATCH_OPERATIONS)).map(async () => {
263
- while (!controller.signal.aborted) {
264
- // Get the next bucket to upload. If there is none, stop this uploader.
265
- // JavaScript is single(ish)-threaded, so we don't need to worry about
266
- // parallel access here.
267
- const nextBucket = uploadBuckets.shift();
268
- if (nextBucket === undefined) break;
269
-
270
- // Read all files in the bucket as base64
271
- // TODO(perf): consider streaming the bulk upload body, rather than
272
- // buffering all base64 contents then JSON-stringifying. This probably
273
- // doesn't matter *too* much: we know buckets will be about 100MB, so
274
- // with 5 uploaders, we could load about 500MB into memory (+ extra
275
- // object keys/tags/copies/etc).
276
- const bucket: KeyValue[] = [];
277
- for (const [absAssetFile, assetKey] of nextBucket) {
278
- bucket.push({
279
- key: assetKey,
280
- value: await readFile(absAssetFile, "base64"),
281
- base64: true,
282
- });
283
- if (controller.signal.aborted) break;
284
- }
285
-
286
- // Upload the bucket to the KV namespace, suppressing logs, we do our own
287
- try {
288
- await putKVBulkKeyValue(
289
- accountId,
290
- namespace,
291
- bucket,
292
- /* quiet */ true,
293
- controller.signal
294
- );
295
- } catch (e) {
296
- // https://developer.mozilla.org/en-US/docs/Web/API/DOMException#error_names
297
- // https://github.com/nodejs/undici/blob/a3efc9814447001a43a976f1c64adc41995df7e3/lib/core/errors.js#L89
298
- if (
299
- typeof e === "object" &&
300
- e !== null &&
301
- "name" in e &&
302
- // @ts-expect-error `e.name` should be typed `unknown`, fixed in
303
- // TypeScript 4.9
304
- e.name === "AbortError"
305
- ) {
306
- break;
307
- }
308
- throw e;
309
- }
310
- uploadedCount += nextBucket.length;
311
- const percent = Math.floor((100 * uploadedCount) / uploadCount);
312
- logger.info(
313
- `Uploaded ${percent}% [${formatNumber(
314
- uploadedCount
315
- )} out of ${formatNumber(uploadCount)}]`
316
- );
317
- }
318
- });
319
- try {
320
- // Wait for all uploaders to complete, or one to fail
321
- await Promise.all(uploaders);
322
- } catch (e) {
323
- // If any uploader fails, abort the others
324
- logger.info(`Upload failed, aborting...`);
325
- controller.abort();
326
- throw e;
327
- }
328
-
329
- // Delete stale assets
330
- const deleteCount = namespaceKeys.size;
331
- if (deleteCount > 0) {
332
- const s = pluralise(deleteCount);
333
- logger.info(`Removing ${formatNumber(deleteCount)} stale asset${s}...`);
334
- }
335
- await deleteKVBulkKeyValue(accountId, namespace, Array.from(namespaceKeys));
336
-
337
- logger.log("↗️ Done syncing assets");
338
-
339
- return { manifest, namespace };
340
- }
341
-
342
- function createPatternMatcher(
343
- patterns: string[],
344
- exclude: boolean
345
- ): (filePath: string) => boolean {
346
- if (patterns.length === 0) {
347
- return (_filePath) => !exclude;
348
- } else {
349
- const ignorer = ignore().add(patterns);
350
- return (filePath) => ignorer.test(filePath).ignored;
351
- }
352
- }
353
-
354
- /**
355
- * validate that the passed-in file is below 25 MiB
356
- * **PRIOR** to base64 encoding. 25 MiB is a KV limit
357
- * @param absFilePath
358
- * @param relativeFilePath
359
- */
360
- async function validateAssetSize(
361
- absFilePath: string,
362
- relativeFilePath: string
363
- ): Promise<void> {
364
- const { size } = await stat(absFilePath);
365
- if (size > 25 * 1024 * 1024) {
366
- throw new Error(
367
- `File ${relativeFilePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`
368
- );
369
- }
370
- }
371
-
372
- function validateAssetKey(assetKey: string) {
373
- if (assetKey.length > 512) {
374
- throw new Error(
375
- `The asset path key "${assetKey}" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits",`
376
- );
377
- }
378
- }
379
-
380
- /**
381
- * Convert a filePath to be safe to use as a relative URL.
382
- *
383
- * Primarily this involves converting Windows backslashes to forward slashes.
384
- */
385
- function urlSafe(filePath: string): string {
386
- return filePath.replace(/\\/g, "/");
387
- }
388
-
389
- /**
390
- * Information about the assets that should be uploaded
391
- */
392
- export interface AssetPaths {
393
- /**
394
- * Absolute path to the root of the project.
395
- *
396
- * This is the directory containing wrangler.toml or cwd if no config.
397
- */
398
- baseDirectory: string;
399
- /**
400
- * The path to the assets directory, relative to the `baseDirectory`.
401
- */
402
- assetDirectory: string;
403
- /**
404
- * An array of patterns that match files that should be uploaded.
405
- */
406
- includePatterns: string[];
407
- /**
408
- * An array of patterns that match files that should not be uploaded.
409
- */
410
- excludePatterns: string[];
411
- }
412
-
413
- /**
414
- * Get an object that describes what assets to upload, if any.
415
- *
416
- * Uses the args (passed from the command line) if available,
417
- * falling back to those defined in the config.
418
- *
419
- * (This function corresponds to --assets/config.assets)
420
- *
421
- */
422
- export function getAssetPaths(
423
- config: Config,
424
- assetDirectory: string | undefined
425
- ): AssetPaths | undefined {
426
- const baseDirectory = assetDirectory
427
- ? process.cwd()
428
- : path.resolve(path.dirname(config.configPath ?? "wrangler.toml"));
429
-
430
- assetDirectory ??=
431
- typeof config.assets === "string"
432
- ? config.assets
433
- : config.assets !== undefined
434
- ? config.assets.bucket
435
- : undefined;
436
-
437
- const includePatterns =
438
- (typeof config.assets !== "string" && config.assets?.include) || [];
439
-
440
- const excludePatterns =
441
- (typeof config.assets !== "string" && config.assets?.exclude) || [];
442
-
443
- return assetDirectory
444
- ? {
445
- baseDirectory,
446
- assetDirectory,
447
- includePatterns,
448
- excludePatterns,
449
- }
450
- : undefined;
451
- }
452
-
453
- /**
454
- * Get an object that describes what site assets to upload, if any.
455
- *
456
- * Uses the args (passed from the command line) if available,
457
- * falling back to those defined in the config.
458
- *
459
- * (This function corresponds to --site/config.site)
460
- *
461
- */
462
- export function getSiteAssetPaths(
463
- config: Config,
464
- assetDirectory?: string,
465
- includePatterns = config.site?.include ?? [],
466
- excludePatterns = config.site?.exclude ?? []
467
- ): AssetPaths | undefined {
468
- const baseDirectory = assetDirectory
469
- ? process.cwd()
470
- : path.resolve(path.dirname(config.configPath ?? "wrangler.toml"));
471
-
472
- assetDirectory ??= config.site?.bucket;
473
-
474
- if (assetDirectory) {
475
- return {
476
- baseDirectory,
477
- assetDirectory,
478
- includePatterns,
479
- excludePatterns,
480
- };
481
- } else {
482
- return undefined;
483
- }
484
- }