wrangler 0.0.0-e6e1daba → 0.0.0-e739b7fe

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 (311) hide show
  1. package/README.md +10 -12
  2. package/bin/wrangler.js +14 -75
  3. package/package.json +226 -194
  4. package/templates/__tests__/tsconfig.json +1 -1
  5. package/templates/checked-fetch.js +10 -3
  6. package/templates/facade.d.ts +4 -1
  7. package/templates/gitignore +0 -4
  8. package/templates/init-tests/test-vitest-new-worker.js +1 -1
  9. package/templates/init-tests/test-vitest-new-worker.ts +1 -1
  10. package/templates/middleware/common.ts +9 -4
  11. package/templates/middleware/loader-modules.ts +67 -15
  12. package/templates/middleware/loader-sw.ts +6 -10
  13. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  14. package/templates/middleware/middleware-ensure-req-body-drained.ts +19 -0
  15. package/templates/middleware/middleware-miniflare3-json-error.ts +18 -5
  16. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  17. package/templates/middleware/middleware-multiworker-dev.ts +68 -0
  18. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  19. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  20. package/templates/modules-watch-stub.js +4 -0
  21. package/templates/new-worker-scheduled.ts +1 -1
  22. package/templates/new-worker.ts +1 -1
  23. package/templates/pages-dev-pipeline.ts +2 -1
  24. package/templates/pages-dev-util.ts +4 -1
  25. package/templates/pages-shim.ts +0 -3
  26. package/templates/pages-template-plugin.ts +12 -2
  27. package/templates/pages-template-worker.ts +11 -2
  28. package/templates/startDevWorker/InspectorProxyWorker.ts +661 -0
  29. package/templates/startDevWorker/ProxyWorker.ts +326 -0
  30. package/templates/tsconfig.init.json +1 -2
  31. package/templates/tsconfig.json +1 -1
  32. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  33. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  34. package/wrangler-dist/ProxyWorker.js +237 -0
  35. package/wrangler-dist/ProxyWorker.js.map +6 -0
  36. package/wrangler-dist/cli.d.ts +22647 -337
  37. package/wrangler-dist/cli.js +137196 -118219
  38. package/wrangler-dist/wasm-sync.wasm +0 -0
  39. package/import_meta_url.js +0 -3
  40. package/miniflare-config-stubs/.env.empty +0 -0
  41. package/miniflare-config-stubs/package.empty.json +0 -1
  42. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  43. package/miniflare-dist/index.mjs +0 -6368
  44. package/src/__tests__/access.test.ts +0 -25
  45. package/src/__tests__/api-dev.test.ts +0 -238
  46. package/src/__tests__/api-devregistry.test.js +0 -64
  47. package/src/__tests__/api.test.ts +0 -80
  48. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  49. package/src/__tests__/config-cache.test.ts +0 -42
  50. package/src/__tests__/configuration.test.ts +0 -4233
  51. package/src/__tests__/d1/d1.test.ts +0 -82
  52. package/src/__tests__/d1/execute.test.ts +0 -64
  53. package/src/__tests__/d1/migrate.test.ts +0 -155
  54. package/src/__tests__/d1/splitter.test.ts +0 -255
  55. package/src/__tests__/delete.test.ts +0 -266
  56. package/src/__tests__/deployments.test.ts +0 -129
  57. package/src/__tests__/dev.test.tsx +0 -1587
  58. package/src/__tests__/generate.test.ts +0 -238
  59. package/src/__tests__/get-host-from-url.test.ts +0 -16
  60. package/src/__tests__/guess-worker-format.test.ts +0 -120
  61. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  62. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  63. package/src/__tests__/helpers/end-event-loop.ts +0 -6
  64. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  65. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  66. package/src/__tests__/helpers/mock-bin.ts +0 -36
  67. package/src/__tests__/helpers/mock-console.ts +0 -106
  68. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  69. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  70. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  71. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  72. package/src/__tests__/helpers/mock-istty.ts +0 -74
  73. package/src/__tests__/helpers/mock-known-routes.ts +0 -12
  74. package/src/__tests__/helpers/mock-kv.ts +0 -46
  75. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  76. package/src/__tests__/helpers/mock-process.ts +0 -34
  77. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  78. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  79. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  80. package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
  81. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  82. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -93
  83. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  84. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  85. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  86. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  87. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  88. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  89. package/src/__tests__/helpers/msw/index.ts +0 -50
  90. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  91. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  92. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  93. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  94. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  95. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  96. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  97. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  98. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  99. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  100. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  101. package/src/__tests__/https-options.test.ts +0 -163
  102. package/src/__tests__/index.test.ts +0 -274
  103. package/src/__tests__/init.test.ts +0 -3164
  104. package/src/__tests__/jest.setup.ts +0 -175
  105. package/src/__tests__/kv.test.ts +0 -1799
  106. package/src/__tests__/logger.test.ts +0 -141
  107. package/src/__tests__/logout.test.ts +0 -47
  108. package/src/__tests__/metrics.test.ts +0 -493
  109. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  110. package/src/__tests__/middleware.test.ts +0 -815
  111. package/src/__tests__/mtls-certificates.test.ts +0 -585
  112. package/src/__tests__/package-manager.test.ts +0 -353
  113. package/src/__tests__/pages/deployment-list.test.ts +0 -78
  114. package/src/__tests__/pages/functions-build.test.ts +0 -402
  115. package/src/__tests__/pages/pages.test.ts +0 -81
  116. package/src/__tests__/pages/project-create.test.ts +0 -63
  117. package/src/__tests__/pages/project-list.test.ts +0 -108
  118. package/src/__tests__/pages/project-upload.test.ts +0 -481
  119. package/src/__tests__/pages/publish.test.ts +0 -2745
  120. package/src/__tests__/pages-deployment-tail.test.ts +0 -955
  121. package/src/__tests__/parse.test.ts +0 -436
  122. package/src/__tests__/paths.test.ts +0 -39
  123. package/src/__tests__/publish.test.ts +0 -8167
  124. package/src/__tests__/pubsub.test.ts +0 -493
  125. package/src/__tests__/queues.test.ts +0 -529
  126. package/src/__tests__/r2.test.ts +0 -374
  127. package/src/__tests__/route.test.ts +0 -45
  128. package/src/__tests__/secret.test.ts +0 -693
  129. package/src/__tests__/tail.test.ts +0 -958
  130. package/src/__tests__/test-old-node-version.js +0 -31
  131. package/src/__tests__/tsconfig-sanity.ts +0 -12
  132. package/src/__tests__/tsconfig.json +0 -8
  133. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  134. package/src/__tests__/type-generation.test.ts +0 -233
  135. package/src/__tests__/user.test.ts +0 -118
  136. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  137. package/src/__tests__/validate-dev-props.test.ts +0 -56
  138. package/src/__tests__/version.test.ts +0 -35
  139. package/src/__tests__/whoami.test.tsx +0 -172
  140. package/src/__tests__/worker-namespace.test.ts +0 -339
  141. package/src/abort.d.ts +0 -3
  142. package/src/api/dev.ts +0 -328
  143. package/src/api/index.ts +0 -11
  144. package/src/api/mtls-certificate.ts +0 -148
  145. package/src/api/pages/create-worker-bundle-contents.ts +0 -75
  146. package/src/api/pages/index.ts +0 -5
  147. package/src/api/pages/publish.tsx +0 -368
  148. package/src/bundle-reporter.ts +0 -68
  149. package/src/bundle.ts +0 -877
  150. package/src/cfetch/index.ts +0 -158
  151. package/src/cfetch/internal.ts +0 -258
  152. package/src/cli.ts +0 -28
  153. package/src/config/README.md +0 -107
  154. package/src/config/config.ts +0 -282
  155. package/src/config/diagnostics.ts +0 -80
  156. package/src/config/environment.ts +0 -586
  157. package/src/config/index.ts +0 -375
  158. package/src/config/validation-helpers.ts +0 -597
  159. package/src/config/validation.ts +0 -2198
  160. package/src/config-cache.ts +0 -85
  161. package/src/create-worker-preview.ts +0 -293
  162. package/src/create-worker-upload-form.ts +0 -334
  163. package/src/d1/backups.tsx +0 -215
  164. package/src/d1/constants.ts +0 -2
  165. package/src/d1/create.tsx +0 -64
  166. package/src/d1/delete.ts +0 -53
  167. package/src/d1/execute.tsx +0 -354
  168. package/src/d1/formatTimeAgo.ts +0 -14
  169. package/src/d1/index.ts +0 -100
  170. package/src/d1/list.tsx +0 -60
  171. package/src/d1/migrations/apply.tsx +0 -206
  172. package/src/d1/migrations/create.tsx +0 -76
  173. package/src/d1/migrations/helpers.ts +0 -172
  174. package/src/d1/migrations/index.ts +0 -3
  175. package/src/d1/migrations/list.tsx +0 -92
  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 -25
  180. package/src/d1/utils.ts +0 -49
  181. package/src/delete.ts +0 -100
  182. package/src/deployments.ts +0 -116
  183. package/src/deprecated/index.ts +0 -144
  184. package/src/dev/dev-vars.ts +0 -39
  185. package/src/dev/dev.tsx +0 -600
  186. package/src/dev/get-local-persistence-path.ts +0 -31
  187. package/src/dev/local.tsx +0 -922
  188. package/src/dev/remote.tsx +0 -632
  189. package/src/dev/start-server.ts +0 -538
  190. package/src/dev/use-esbuild.ts +0 -205
  191. package/src/dev/validate-dev-props.ts +0 -31
  192. package/src/dev-registry.ts +0 -201
  193. package/src/dev.tsx +0 -914
  194. package/src/dialogs.ts +0 -136
  195. package/src/dispatch-namespace.ts +0 -211
  196. package/src/docs/index.ts +0 -97
  197. package/src/durable.ts +0 -102
  198. package/src/entry.ts +0 -327
  199. package/src/environment-variables/factory.ts +0 -88
  200. package/src/environment-variables/misc-variables.ts +0 -30
  201. package/src/errors.ts +0 -11
  202. package/src/generate/index.ts +0 -298
  203. package/src/git-client.ts +0 -135
  204. package/src/global-wrangler-config-path.ts +0 -26
  205. package/src/https-options.ts +0 -127
  206. package/src/index.ts +0 -705
  207. package/src/init.ts +0 -1022
  208. package/src/inspect.ts +0 -782
  209. package/src/intl-polyfill.d.ts +0 -139
  210. package/src/is-ci.ts +0 -14
  211. package/src/is-interactive.ts +0 -16
  212. package/src/jest.d.ts +0 -4
  213. package/src/kv/helpers.ts +0 -430
  214. package/src/kv/index.ts +0 -594
  215. package/src/logger.ts +0 -104
  216. package/src/metrics/index.ts +0 -5
  217. package/src/metrics/metrics-config.ts +0 -239
  218. package/src/metrics/metrics-dispatcher.ts +0 -96
  219. package/src/metrics/metrics-usage-headers.ts +0 -24
  220. package/src/metrics/send-event.ts +0 -98
  221. package/src/miniflare-cli/README.md +0 -30
  222. package/src/miniflare-cli/assets.ts +0 -251
  223. package/src/miniflare-cli/index.ts +0 -210
  224. package/src/miniflare-cli/request-context.ts +0 -40
  225. package/src/miniflare-cli/tsconfig.json +0 -9
  226. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  227. package/src/miniflare-cli/types.ts +0 -11
  228. package/src/module-collection.ts +0 -267
  229. package/src/mtls-certificate/cli.ts +0 -155
  230. package/src/open-in-browser.ts +0 -17
  231. package/src/package-manager.ts +0 -219
  232. package/src/pages/build.ts +0 -232
  233. package/src/pages/buildFunctions.ts +0 -130
  234. package/src/pages/constants.ts +0 -18
  235. package/src/pages/deployment-tails.ts +0 -281
  236. package/src/pages/deployments.tsx +0 -86
  237. package/src/pages/dev.ts +0 -716
  238. package/src/pages/errors.ts +0 -66
  239. package/src/pages/functions/buildPlugin.ts +0 -90
  240. package/src/pages/functions/buildWorker.ts +0 -288
  241. package/src/pages/functions/filepath-routing.test.ts +0 -234
  242. package/src/pages/functions/filepath-routing.ts +0 -189
  243. package/src/pages/functions/identifiers.ts +0 -78
  244. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  245. package/src/pages/functions/routes-consolidation.ts +0 -73
  246. package/src/pages/functions/routes-transformation.test.ts +0 -282
  247. package/src/pages/functions/routes-transformation.ts +0 -115
  248. package/src/pages/functions/routes-validation.test.ts +0 -403
  249. package/src/pages/functions/routes-validation.ts +0 -202
  250. package/src/pages/functions/routes.ts +0 -151
  251. package/src/pages/functions/tsconfig.json +0 -8
  252. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  253. package/src/pages/functions.ts +0 -86
  254. package/src/pages/hash.ts +0 -13
  255. package/src/pages/index.ts +0 -102
  256. package/src/pages/projects.tsx +0 -162
  257. package/src/pages/prompt-select-project.tsx +0 -31
  258. package/src/pages/publish.tsx +0 -276
  259. package/src/pages/types.ts +0 -46
  260. package/src/pages/upload.tsx +0 -449
  261. package/src/pages/utils.ts +0 -23
  262. package/src/parse.ts +0 -308
  263. package/src/paths.ts +0 -71
  264. package/src/proxy.ts +0 -694
  265. package/src/publish/index.ts +0 -274
  266. package/src/publish/publish.ts +0 -1065
  267. package/src/pubsub/index.ts +0 -286
  268. package/src/pubsub/pubsub-commands.ts +0 -623
  269. package/src/queues/cli/commands/consumer/add.ts +0 -65
  270. package/src/queues/cli/commands/consumer/index.ts +0 -19
  271. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  272. package/src/queues/cli/commands/create.ts +0 -25
  273. package/src/queues/cli/commands/delete.ts +0 -26
  274. package/src/queues/cli/commands/index.ts +0 -35
  275. package/src/queues/cli/commands/list.ts +0 -25
  276. package/src/queues/client.ts +0 -135
  277. package/src/queues/utils.ts +0 -18
  278. package/src/r2/constants.ts +0 -4
  279. package/src/r2/helpers.ts +0 -132
  280. package/src/r2/index.ts +0 -289
  281. package/src/routes.ts +0 -140
  282. package/src/secret/index.ts +0 -375
  283. package/src/selfsigned.d.ts +0 -29
  284. package/src/sites.ts +0 -372
  285. package/src/tail/createTail.ts +0 -406
  286. package/src/tail/filters.ts +0 -277
  287. package/src/tail/index.ts +0 -211
  288. package/src/tail/printing.ts +0 -122
  289. package/src/tsconfig-sanity.ts +0 -16
  290. package/src/type-generation.ts +0 -181
  291. package/src/update-check.ts +0 -19
  292. package/src/user/access.ts +0 -68
  293. package/src/user/auth-variables.ts +0 -113
  294. package/src/user/choose-account.tsx +0 -39
  295. package/src/user/generate-auth-url.ts +0 -33
  296. package/src/user/generate-random-state.ts +0 -16
  297. package/src/user/index.ts +0 -2
  298. package/src/user/user.ts +0 -1233
  299. package/src/utils/collectKeyValues.ts +0 -14
  300. package/src/whoami.ts +0 -135
  301. package/src/worker.ts +0 -257
  302. package/src/yargs-types.ts +0 -37
  303. package/src/zones.ts +0 -191
  304. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  305. package/templates/d1-beta-facade.js +0 -241
  306. package/templates/first-party-worker-module-facade.ts +0 -19
  307. package/templates/format-dev-errors.ts +0 -34
  308. package/templates/serve-static-assets.ts +0 -66
  309. package/templates/service-bindings-module-facade.js +0 -55
  310. package/templates/service-bindings-sw-facade.js +0 -42
  311. package/templates/tsconfig.tsbuildinfo +0 -1
package/src/sites.ts DELETED
@@ -1,372 +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 ignore from "ignore";
5
- import xxhash from "xxhash-wasm";
6
- import {
7
- createKVNamespace,
8
- listKVNamespaceKeys,
9
- listKVNamespaces,
10
- putKVBulkKeyValue,
11
- deleteKVBulkKeyValue,
12
- } from "./kv/helpers";
13
- import { logger } from "./logger";
14
- import type { Config } from "./config";
15
- import type { KeyValue } from "./kv/helpers";
16
- import type { XXHashAPI } from "xxhash-wasm";
17
-
18
- /** Paths to always ignore. */
19
- const ALWAYS_IGNORE = new Set(["node_modules"]);
20
- const HIDDEN_FILES_TO_INCLUDE = new Set([
21
- ".well-known", // See https://datatracker.ietf.org/doc/html/rfc8615
22
- ]);
23
-
24
- async function* getFilesInFolder(dirPath: string): AsyncIterable<string> {
25
- const files = await readdir(dirPath, { withFileTypes: true });
26
- for (const file of files) {
27
- // Skip files that we never want to process.
28
- if (ALWAYS_IGNORE.has(file.name)) {
29
- continue;
30
- }
31
- // Skip hidden files (starting with .) except for some special ones
32
- if (file.name.startsWith(".") && !HIDDEN_FILES_TO_INCLUDE.has(file.name)) {
33
- continue;
34
- }
35
- // TODO: follow symlinks??
36
- if (file.isDirectory()) {
37
- yield* await getFilesInFolder(path.join(dirPath, file.name));
38
- } else {
39
- yield path.join(dirPath, file.name);
40
- }
41
- }
42
- }
43
-
44
- /**
45
- * Create a hash key for the given content using the xxhash algorithm.
46
- *
47
- * Note we only return the first 10 characters, since we will also include the file name in the asset manifest key
48
- * the most important thing here is to detect changes of a single file to invalidate the cache and
49
- * it's impossible to serve two different files with the same name
50
- */
51
- function hashFileContent(hasher: XXHashAPI, content: string): string {
52
- return hasher.h64ToString(content).substring(0, 10);
53
- }
54
-
55
- /**
56
- * Create a hashed asset key for the given asset.
57
- *
58
- * The key will change if the file path or content of the asset changes.
59
- * The algorithm used here matches that of Wrangler v1.
60
- */
61
- function hashAsset(
62
- hasher: XXHashAPI,
63
- filePath: string,
64
- content: string
65
- ): string {
66
- const extName = path.extname(filePath) || "";
67
- const baseName = path.basename(filePath, extName);
68
- const directory = path.dirname(filePath);
69
- const hash = hashFileContent(hasher, content);
70
- return urlSafe(path.join(directory, `${baseName}.${hash}${extName}`));
71
- }
72
-
73
- async function createKVNamespaceIfNotAlreadyExisting(
74
- title: string,
75
- accountId: string
76
- ) {
77
- // check if it already exists
78
- // TODO: this is super inefficient, should be made better
79
- const namespaces = await listKVNamespaces(accountId);
80
- const found = namespaces.find((ns) => ns.title === title);
81
- if (found) {
82
- return { created: false, id: found.id };
83
- }
84
-
85
- // else we make the namespace
86
- const id = await createKVNamespace(accountId, title);
87
- logger.log(`🌀 Created namespace for Workers Site "${title}"`);
88
-
89
- return {
90
- created: true,
91
- id,
92
- };
93
- }
94
-
95
- /**
96
- * Upload the assets found within the `dirPath` directory to the sites assets KV namespace for
97
- * the worker given by `scriptName`.
98
- *
99
- * @param accountId the account to upload to.
100
- * @param scriptName the name of the worker whose assets we are uploading.
101
- * @param siteAssets an objects describing what assets to upload, or undefined if there are no assets to upload.
102
- * @param preview if true then upload to a "preview" KV namespace.
103
- * @returns a promise for an object mapping the relative paths of the assets to the key of that
104
- * asset in the KV namespace.
105
- */
106
- export async function syncAssets(
107
- accountId: string | undefined,
108
- scriptName: string,
109
- siteAssets: AssetPaths | undefined,
110
- preview: boolean,
111
- dryRun: boolean | undefined
112
- ): Promise<{
113
- manifest: { [filePath: string]: string } | undefined;
114
- namespace: string | undefined;
115
- }> {
116
- if (siteAssets === undefined) {
117
- return { manifest: undefined, namespace: undefined };
118
- }
119
-
120
- if (dryRun) {
121
- logger.log("(Note: doing a dry run, not uploading or deleting anything.)");
122
- return { manifest: undefined, namespace: undefined };
123
- }
124
- assert(accountId, "Missing accountId");
125
-
126
- const title = `__${scriptName}-workers_sites_assets${
127
- preview ? "_preview" : ""
128
- }`;
129
-
130
- const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
131
- title,
132
- accountId
133
- );
134
-
135
- // let's get all the keys in this namespace
136
- const namespaceKeysResponse = await listKVNamespaceKeys(accountId, namespace);
137
- const namespaceKeys = new Set(namespaceKeysResponse.map((x) => x.name));
138
-
139
- const manifest: Record<string, string> = {};
140
-
141
- // A batch of uploads where each bucket has to be less than 98mb
142
- const uploadBuckets: KeyValue[][] = [];
143
- // The "live" bucket that we'll keep filling until it's just below 98mb
144
- let uploadBucket: KeyValue[] = [];
145
- // A size counter for the live bucket
146
- let uploadBucketSize = 0;
147
-
148
- const include = createPatternMatcher(siteAssets.includePatterns, false);
149
- const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
150
- const hasher = await xxhash();
151
-
152
- const assetDirectory = path.join(
153
- siteAssets.baseDirectory,
154
- siteAssets.assetDirectory
155
- );
156
- for await (const absAssetFile of getFilesInFolder(assetDirectory)) {
157
- const assetFile = path.relative(assetDirectory, absAssetFile);
158
- if (!include(assetFile)) {
159
- continue;
160
- }
161
- if (exclude(assetFile)) {
162
- continue;
163
- }
164
-
165
- logger.log(`Reading ${assetFile}...`);
166
- const content = await readFile(absAssetFile, "base64");
167
- await validateAssetSize(absAssetFile, assetFile);
168
- // while KV accepts files that are 25 MiB **before** b64 encoding
169
- // the overall bucket size must be below 100 MB **after** b64 encoding
170
- const assetSize = Buffer.from(content).length;
171
- const assetKey = hashAsset(hasher, assetFile, content);
172
- validateAssetKey(assetKey);
173
-
174
- // now put each of the files into kv
175
- if (!namespaceKeys.has(assetKey)) {
176
- logger.log(`Uploading as ${assetKey}...`);
177
-
178
- // Check if adding this asset to the bucket would
179
- // push it over the 98 MiB limit KV bulk API limit
180
- if (uploadBucketSize + assetSize > 98 * 1000 * 1000) {
181
- // If so, move the current bucket into the batch,
182
- // and reset the counter/bucket
183
- uploadBuckets.push(uploadBucket);
184
- uploadBucketSize = 0;
185
- uploadBucket = [];
186
- }
187
-
188
- // Update the bucket and the size counter
189
- uploadBucketSize += assetSize;
190
- uploadBucket.push({
191
- key: assetKey,
192
- value: content,
193
- base64: true,
194
- });
195
- } else {
196
- logger.log(`Skipping - already uploaded.`);
197
- }
198
-
199
- // Remove the key from the set so we know what we've already uploaded
200
- namespaceKeys.delete(assetKey);
201
-
202
- // Prevent different manifest keys on windows
203
- const manifestKey = urlSafe(path.relative(assetDirectory, absAssetFile));
204
- manifest[manifestKey] = assetKey;
205
- }
206
-
207
- // Add the last (potentially only) bucket to the batch
208
- uploadBuckets.push(uploadBucket);
209
-
210
- // keys now contains all the files we're deleting
211
- for (const key of namespaceKeys) {
212
- logger.log(`Deleting ${key} from the asset store...`);
213
- }
214
-
215
- // upload each bucket in parallel
216
- const bucketsToPut = [];
217
- for (const bucket of uploadBuckets) {
218
- bucketsToPut.push(putKVBulkKeyValue(accountId, namespace, bucket));
219
- }
220
- await Promise.all(bucketsToPut);
221
-
222
- // then delete all the assets that aren't used anymore
223
- await deleteKVBulkKeyValue(accountId, namespace, Array.from(namespaceKeys));
224
-
225
- logger.log("↗️ Done syncing assets");
226
-
227
- return { manifest, namespace };
228
- }
229
-
230
- function createPatternMatcher(
231
- patterns: string[],
232
- exclude: boolean
233
- ): (filePath: string) => boolean {
234
- if (patterns.length === 0) {
235
- return (_filePath) => !exclude;
236
- } else {
237
- const ignorer = ignore().add(patterns);
238
- return (filePath) => ignorer.test(filePath).ignored;
239
- }
240
- }
241
-
242
- /**
243
- * validate that the passed-in file is below 25 MiB
244
- * **PRIOR** to base64 encoding. 25 MiB is a KV limit
245
- * @param absFilePath
246
- * @param relativeFilePath
247
- */
248
- async function validateAssetSize(
249
- absFilePath: string,
250
- relativeFilePath: string
251
- ): Promise<void> {
252
- const { size } = await stat(absFilePath);
253
- if (size > 25 * 1024 * 1024) {
254
- throw new Error(
255
- `File ${relativeFilePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`
256
- );
257
- }
258
- }
259
-
260
- function validateAssetKey(assetKey: string) {
261
- if (assetKey.length > 512) {
262
- throw new Error(
263
- `The asset path key "${assetKey}" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits",`
264
- );
265
- }
266
- }
267
-
268
- /**
269
- * Convert a filePath to be safe to use as a relative URL.
270
- *
271
- * Primarily this involves converting Windows backslashes to forward slashes.
272
- */
273
- function urlSafe(filePath: string): string {
274
- return filePath.replace(/\\/g, "/");
275
- }
276
-
277
- /**
278
- * Information about the assets that should be uploaded
279
- */
280
- export interface AssetPaths {
281
- /**
282
- * Absolute path to the root of the project.
283
- *
284
- * This is the directory containing wrangler.toml or cwd if no config.
285
- */
286
- baseDirectory: string;
287
- /**
288
- * The path to the assets directory, relative to the `baseDirectory`.
289
- */
290
- assetDirectory: string;
291
- /**
292
- * An array of patterns that match files that should be uploaded.
293
- */
294
- includePatterns: string[];
295
- /**
296
- * An array of patterns that match files that should not be uploaded.
297
- */
298
- excludePatterns: string[];
299
- }
300
-
301
- /**
302
- * Get an object that describes what assets to upload, if any.
303
- *
304
- * Uses the args (passed from the command line) if available,
305
- * falling back to those defined in the config.
306
- *
307
- * (This function corresponds to --assets/config.assets)
308
- *
309
- */
310
- export function getAssetPaths(
311
- config: Config,
312
- assetDirectory: string | undefined
313
- ): AssetPaths | undefined {
314
- const baseDirectory = assetDirectory
315
- ? process.cwd()
316
- : path.resolve(path.dirname(config.configPath ?? "wrangler.toml"));
317
-
318
- assetDirectory ??=
319
- typeof config.assets === "string"
320
- ? config.assets
321
- : config.assets !== undefined
322
- ? config.assets.bucket
323
- : undefined;
324
-
325
- const includePatterns =
326
- (typeof config.assets !== "string" && config.assets?.include) || [];
327
-
328
- const excludePatterns =
329
- (typeof config.assets !== "string" && config.assets?.exclude) || [];
330
-
331
- return assetDirectory
332
- ? {
333
- baseDirectory,
334
- assetDirectory,
335
- includePatterns,
336
- excludePatterns,
337
- }
338
- : undefined;
339
- }
340
-
341
- /**
342
- * Get an object that describes what site assets to upload, if any.
343
- *
344
- * Uses the args (passed from the command line) if available,
345
- * falling back to those defined in the config.
346
- *
347
- * (This function corresponds to --site/config.site)
348
- *
349
- */
350
- export function getSiteAssetPaths(
351
- config: Config,
352
- assetDirectory?: string,
353
- includePatterns = config.site?.include ?? [],
354
- excludePatterns = config.site?.exclude ?? []
355
- ): AssetPaths | undefined {
356
- const baseDirectory = assetDirectory
357
- ? process.cwd()
358
- : path.resolve(path.dirname(config.configPath ?? "wrangler.toml"));
359
-
360
- assetDirectory ??= config.site?.bucket;
361
-
362
- if (assetDirectory) {
363
- return {
364
- baseDirectory,
365
- assetDirectory,
366
- includePatterns,
367
- excludePatterns,
368
- };
369
- } else {
370
- return undefined;
371
- }
372
- }