wrangler 0.0.0-fe5dcfd → 0.0.0-ff2e7cb

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 (195) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +33 -14
  3. package/bin/wrangler.js +126 -25
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +4893 -0
  6. package/package.json +156 -127
  7. package/src/__tests__/config-cache.test.ts +36 -0
  8. package/src/__tests__/configuration.test.ts +3829 -0
  9. package/src/__tests__/dev.test.tsx +1155 -63
  10. package/src/__tests__/guess-worker-format.test.ts +85 -0
  11. package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
  12. package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
  13. package/src/__tests__/helpers/faye-websocket.d.ts +6 -0
  14. package/src/__tests__/helpers/mock-account-id.ts +48 -0
  15. package/src/__tests__/helpers/mock-bin.ts +36 -0
  16. package/src/__tests__/helpers/mock-cfetch.ts +211 -0
  17. package/src/__tests__/helpers/mock-console.ts +97 -0
  18. package/src/__tests__/helpers/mock-dialogs.ts +153 -0
  19. package/src/__tests__/helpers/mock-http-server.ts +46 -0
  20. package/src/__tests__/helpers/mock-istty.ts +74 -0
  21. package/src/__tests__/helpers/mock-kv.ts +33 -0
  22. package/src/__tests__/helpers/mock-oauth-flow.ts +250 -0
  23. package/src/__tests__/helpers/mock-process.ts +39 -0
  24. package/src/__tests__/helpers/mock-stdin.ts +108 -0
  25. package/src/__tests__/helpers/mock-web-socket.ts +29 -0
  26. package/src/__tests__/helpers/run-in-tmp.ts +39 -0
  27. package/src/__tests__/helpers/run-wrangler.ts +16 -0
  28. package/src/__tests__/helpers/write-worker-source.ts +31 -0
  29. package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
  30. package/src/__tests__/https-options.test.ts +130 -0
  31. package/src/__tests__/index.test.ts +222 -251
  32. package/src/__tests__/init.test.ts +1992 -0
  33. package/src/__tests__/jest.setup.ts +95 -10
  34. package/src/__tests__/kv.test.ts +1361 -941
  35. package/src/__tests__/logger.test.ts +141 -0
  36. package/src/__tests__/package-manager.test.ts +353 -0
  37. package/src/__tests__/pages.test.ts +1254 -0
  38. package/src/__tests__/parse.test.ts +330 -0
  39. package/src/__tests__/publish.test.ts +6481 -705
  40. package/src/__tests__/pubsub.test.ts +276 -0
  41. package/src/__tests__/r2.test.ts +233 -0
  42. package/src/__tests__/route.test.ts +45 -0
  43. package/src/__tests__/secret.test.ts +486 -0
  44. package/src/__tests__/tail.test.ts +690 -0
  45. package/src/__tests__/user.test.ts +143 -0
  46. package/src/__tests__/whoami.test.tsx +212 -122
  47. package/src/abort.d.ts +3 -0
  48. package/src/api/dev.ts +39 -0
  49. package/src/api/index.ts +1 -0
  50. package/src/bundle-reporter.tsx +29 -0
  51. package/src/bundle.ts +212 -0
  52. package/src/cfetch/index.ts +88 -77
  53. package/src/cfetch/internal.ts +124 -46
  54. package/src/cli.ts +24 -6
  55. package/src/config/README.md +107 -0
  56. package/src/config/config.ts +243 -0
  57. package/src/config/diagnostics.ts +80 -0
  58. package/src/config/environment.ts +430 -0
  59. package/src/config/index.ts +225 -0
  60. package/src/config/validation-helpers.ts +584 -0
  61. package/src/config/validation.ts +1693 -0
  62. package/src/config-cache.ts +44 -0
  63. package/src/create-worker-preview.ts +199 -0
  64. package/src/create-worker-upload-form.ts +254 -0
  65. package/src/dev/dev-vars.ts +36 -0
  66. package/src/dev/dev.tsx +417 -0
  67. package/src/dev/local.tsx +350 -0
  68. package/src/dev/remote.tsx +294 -0
  69. package/src/dev/use-esbuild.ts +150 -0
  70. package/src/dev.tsx +515 -768
  71. package/src/dialogs.tsx +117 -59
  72. package/src/durable.ts +102 -0
  73. package/src/entry.ts +328 -0
  74. package/src/environment-variables.ts +35 -0
  75. package/src/errors.ts +11 -0
  76. package/src/generate.ts +33 -0
  77. package/src/git-client.ts +42 -0
  78. package/src/https-options.ts +123 -0
  79. package/src/index.tsx +1835 -1948
  80. package/src/init.ts +549 -0
  81. package/src/inspect.ts +615 -496
  82. package/src/intl-polyfill.d.ts +139 -0
  83. package/src/kv.ts +408 -0
  84. package/src/logger.ts +73 -0
  85. package/src/miniflare-cli/README.md +30 -0
  86. package/src/miniflare-cli/enum-keys.ts +17 -0
  87. package/src/miniflare-cli/index.ts +52 -0
  88. package/src/miniflare-cli/request-context.ts +40 -0
  89. package/src/module-collection.ts +247 -53
  90. package/src/open-in-browser.ts +17 -0
  91. package/src/package-manager.ts +174 -0
  92. package/src/pages/build.tsx +202 -0
  93. package/src/pages/constants.ts +7 -0
  94. package/src/pages/deployments.tsx +101 -0
  95. package/src/pages/dev.tsx +964 -0
  96. package/src/pages/functions/buildPlugin.ts +105 -0
  97. package/src/pages/functions/buildWorker.ts +151 -0
  98. package/src/pages/functions/filepath-routing.test.ts +234 -0
  99. package/src/pages/functions/filepath-routing.ts +189 -0
  100. package/src/pages/functions/identifiers.ts +78 -0
  101. package/src/pages/functions/routes.ts +151 -0
  102. package/src/pages/index.tsx +84 -0
  103. package/src/pages/projects.tsx +157 -0
  104. package/src/pages/publish.tsx +335 -0
  105. package/src/pages/types.ts +40 -0
  106. package/src/pages/upload.tsx +384 -0
  107. package/src/pages/utils.ts +12 -0
  108. package/src/parse.ts +286 -0
  109. package/src/paths.ts +26 -0
  110. package/src/preview.ts +31 -0
  111. package/src/proxy.ts +428 -254
  112. package/src/publish.ts +749 -365
  113. package/src/pubsub/index.ts +286 -0
  114. package/src/pubsub/pubsub-commands.tsx +604 -0
  115. package/src/r2.ts +50 -0
  116. package/src/selfsigned.d.ts +29 -0
  117. package/src/sites.tsx +294 -165
  118. package/src/tail/filters.ts +279 -0
  119. package/src/tail/index.ts +299 -0
  120. package/src/tail/printing.ts +67 -0
  121. package/src/update-check.ts +19 -0
  122. package/src/user/choose-account.tsx +60 -0
  123. package/src/user/env-vars.ts +46 -0
  124. package/src/user/generate-auth-url.ts +33 -0
  125. package/src/user/generate-random-state.ts +16 -0
  126. package/src/user/index.ts +3 -0
  127. package/src/user/user.tsx +1130 -0
  128. package/src/whoami.tsx +62 -41
  129. package/src/worker.ts +185 -0
  130. package/src/zones.ts +76 -0
  131. package/templates/checked-fetch.js +17 -0
  132. package/templates/gitignore +171 -0
  133. package/templates/new-worker-scheduled.js +17 -0
  134. package/templates/new-worker-scheduled.ts +32 -0
  135. package/templates/new-worker.js +15 -0
  136. package/templates/new-worker.ts +30 -0
  137. package/templates/no-op-worker.js +10 -0
  138. package/templates/pages-template-plugin.ts +155 -0
  139. package/templates/pages-template-worker.ts +161 -0
  140. package/templates/static-asset-facade.js +43 -0
  141. package/templates/tsconfig.json +105 -0
  142. package/wrangler-dist/cli.js +117167 -114038
  143. package/pages/functions/buildWorker.ts +0 -62
  144. package/pages/functions/filepath-routing.test.ts +0 -39
  145. package/pages/functions/filepath-routing.ts +0 -228
  146. package/pages/functions/identifiers.ts +0 -78
  147. package/pages/functions/routes.ts +0 -158
  148. package/pages/functions/template-worker.ts +0 -136
  149. package/src/__tests__/mock-cfetch.ts +0 -173
  150. package/src/__tests__/mock-dialogs.ts +0 -65
  151. package/src/__tests__/run-in-tmp.ts +0 -19
  152. package/src/__tests__/run-wrangler.ts +0 -32
  153. package/src/api/form_data.ts +0 -131
  154. package/src/api/preview.ts +0 -128
  155. package/src/api/worker.ts +0 -155
  156. package/src/config.ts +0 -646
  157. package/src/kv.tsx +0 -276
  158. package/src/pages.tsx +0 -1040
  159. package/src/tail.tsx +0 -73
  160. package/src/user.tsx +0 -1019
  161. package/static-asset-facade.js +0 -47
  162. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  163. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  164. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  165. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  166. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  167. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  168. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  169. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  170. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  171. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  172. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  173. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  174. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  175. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  176. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  177. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  178. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  179. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  180. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  181. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  182. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  183. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  184. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  185. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  186. package/vendor/wrangler-mime/LICENSE +0 -21
  187. package/vendor/wrangler-mime/Mime.js +0 -97
  188. package/vendor/wrangler-mime/README.md +0 -187
  189. package/vendor/wrangler-mime/cli.js +0 -46
  190. package/vendor/wrangler-mime/index.js +0 -4
  191. package/vendor/wrangler-mime/lite.js +0 -4
  192. package/vendor/wrangler-mime/package.json +0 -52
  193. package/vendor/wrangler-mime/types/other.js +0 -1
  194. package/vendor/wrangler-mime/types/standard.js +0 -1
  195. package/wrangler-dist/cli.js.map +0 -7
package/src/sites.tsx CHANGED
@@ -1,38 +1,44 @@
1
- import * as path from "node:path";
1
+ import assert from "node:assert";
2
2
  import { readdir, readFile, stat } from "node:fs/promises";
3
+ import * as path from "node:path";
3
4
  import ignore from "ignore";
4
- import { XXHash64 } from "xxhash-addon";
5
- import { fetchResult } from "./cfetch";
5
+ import xxhash from "xxhash-wasm";
6
+ import {
7
+ createKVNamespace,
8
+ listKVNamespaceKeys,
9
+ listKVNamespaces,
10
+ putKVBulkKeyValue,
11
+ deleteKVBulkKeyValue,
12
+ } from "./kv";
13
+ import { logger } from "./logger";
6
14
  import type { Config } from "./config";
7
- import { listNamespaceKeys, listNamespaces, putBulkKeyValue } from "./kv";
15
+ import type { KeyValue } from "./kv";
16
+ import type { XXHashAPI } from "xxhash-wasm";
8
17
 
9
18
  /** Paths to always ignore. */
10
- const ALWAYS_IGNORE = ["node_modules"];
11
- const HIDDEN_FILES_TO_INCLUDE = [
12
- ".well-known", // See https://datatracker.ietf.org/doc/html/rfc8615
13
- ];
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
+ ]);
14
23
 
15
24
  async function* getFilesInFolder(dirPath: string): AsyncIterable<string> {
16
- const files = await readdir(dirPath, { withFileTypes: true });
17
- for (const file of files) {
18
- // Skip files that we never want to process.
19
- if (ALWAYS_IGNORE.some((p) => file.name === p)) {
20
- continue;
21
- }
22
- // Skip hidden files (starting with .) except for some special ones
23
- if (
24
- file.name.startsWith(".") &&
25
- !HIDDEN_FILES_TO_INCLUDE.some((p) => file.name === p)
26
- ) {
27
- continue;
28
- }
29
- // TODO: follow symlinks??
30
- if (file.isDirectory()) {
31
- yield* await getFilesInFolder(path.join(dirPath, file.name));
32
- } else {
33
- yield path.join(dirPath, file.name);
34
- }
35
- }
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
+ }
36
42
  }
37
43
 
38
44
  /**
@@ -42,11 +48,8 @@ async function* getFilesInFolder(dirPath: string): AsyncIterable<string> {
42
48
  * the most important thing here is to detect changes of a single file to invalidate the cache and
43
49
  * it's impossible to serve two different files with the same name
44
50
  */
45
- function hashFileContent(content: string): string {
46
- const hasher = new XXHash64();
47
- hasher.update(Buffer.from(content));
48
- const hash = hasher.digest();
49
- return hash.toString("hex").substring(0, 10);
51
+ function hashFileContent(hasher: XXHashAPI, content: string): string {
52
+ return hasher.h64ToString(content).substring(0, 10);
50
53
  }
51
54
 
52
55
  /**
@@ -55,43 +58,38 @@ function hashFileContent(content: string): string {
55
58
  * The key will change if the file path or content of the asset changes.
56
59
  * The algorithm used here matches that of Wrangler 1.
57
60
  */
58
- function hashAsset(filePath: string, content: string): string {
59
- const extName = path.extname(filePath) || "";
60
- const baseName = path.basename(filePath, extName);
61
- const directory = path.dirname(filePath);
62
- const hash = hashFileContent(content);
63
- return urlSafe(path.join(directory, `${baseName}.${hash}${extName}`));
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}`));
64
71
  }
65
72
 
66
73
  async function createKVNamespaceIfNotAlreadyExisting(
67
- title: string,
68
- accountId: string
74
+ title: string,
75
+ accountId: string
69
76
  ) {
70
- // check if it already exists
71
- // TODO: this is super inefficient, should be made better
72
- const namespaces = await listNamespaces(accountId);
73
- const found = namespaces.find((x) => x.title === title);
74
- if (found) {
75
- return { created: false, id: found.id };
76
- }
77
-
78
- // else we make the namespace
79
- // TODO: use an export from ./kv
80
- const json = await fetchResult<{ id: string }>(
81
- `/accounts/${accountId}/storage/kv/namespaces`,
82
- {
83
- method: "POST",
84
- headers: {
85
- "Content-Type": "application/json",
86
- },
87
- body: JSON.stringify({ title }),
88
- }
89
- );
90
-
91
- return {
92
- created: true,
93
- id: json.id,
94
- };
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((x) => x.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
+ };
95
93
  }
96
94
 
97
95
  /**
@@ -102,103 +100,169 @@ async function createKVNamespaceIfNotAlreadyExisting(
102
100
  * @param scriptName the name of the worker whose assets we are uploading.
103
101
  * @param siteAssets an objects describing what assets to upload, or undefined if there are no assets to upload.
104
102
  * @param preview if true then upload to a "preview" KV namespace.
105
- * @param _env (not implemented).
106
103
  * @returns a promise for an object mapping the relative paths of the assets to the key of that
107
104
  * asset in the KV namespace.
108
105
  */
109
106
  export async function syncAssets(
110
- accountId: string,
111
- scriptName: string,
112
- siteAssets: AssetPaths | undefined,
113
- preview: boolean,
114
- _env?: string
107
+ accountId: string | undefined,
108
+ scriptName: string,
109
+ siteAssets: AssetPaths | undefined,
110
+ preview: boolean,
111
+ dryRun: boolean | undefined
115
112
  ): Promise<{
116
- manifest: { [filePath: string]: string } | undefined;
117
- namespace: string | undefined;
113
+ manifest: { [filePath: string]: string } | undefined;
114
+ namespace: string | undefined;
118
115
  }> {
119
- if (siteAssets === undefined) {
120
- return { manifest: undefined, namespace: undefined };
121
- }
122
-
123
- const title = `__${scriptName}_sites_assets${preview ? "_preview" : ""}`;
124
- const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
125
- title,
126
- accountId
127
- );
128
-
129
- // let's get all the keys in this namespace
130
- const result = await listNamespaceKeys(accountId, namespace);
131
- const keys = new Set(result.map((x) => x.name));
132
-
133
- const manifest = {};
134
- const upload: {
135
- key: string;
136
- value: string;
137
- base64: boolean;
138
- }[] = [];
139
-
140
- const include = createPatternMatcher(siteAssets.includePatterns, false);
141
- const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
142
- // TODO: this can be more efficient by parallelising
143
- for await (const file of getFilesInFolder(siteAssets.baseDirectory)) {
144
- if (!include(file)) {
145
- continue;
146
- }
147
- if (exclude(file)) {
148
- continue;
149
- }
150
-
151
- await validateAssetSize(file);
152
- console.log(`reading ${file}...`);
153
- const content = await readFile(file, "base64");
154
-
155
- const assetKey = hashAsset(file, content);
156
- validateAssetKey(assetKey);
157
-
158
- // now put each of the files into kv
159
- if (!keys.has(assetKey)) {
160
- console.log(`uploading as ${assetKey}...`);
161
- upload.push({
162
- key: assetKey,
163
- value: content,
164
- base64: true,
165
- });
166
- } else {
167
- console.log(`skipping - already uploaded`);
168
- }
169
- manifest[path.relative(siteAssets.baseDirectory, file)] = assetKey;
170
- }
171
- await putBulkKeyValue(accountId, namespace, JSON.stringify(upload));
172
- return { manifest, namespace };
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 };
173
228
  }
174
229
 
175
230
  function createPatternMatcher(
176
- patterns: string[],
177
- exclude: boolean
231
+ patterns: string[],
232
+ exclude: boolean
178
233
  ): (filePath: string) => boolean {
179
- if (patterns.length === 0) {
180
- return (_filePath) => !exclude;
181
- } else {
182
- const ignorer = ignore().add(patterns);
183
- return (filePath) => ignorer.test(filePath).ignored;
184
- }
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
+ }
185
240
  }
186
241
 
187
- async function validateAssetSize(filePath: string) {
188
- const { size } = await stat(filePath);
189
- if (size > 25 * 1024 * 1024) {
190
- throw new Error(
191
- `File ${filePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`
192
- );
193
- }
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
+ }
194
258
  }
195
259
 
196
260
  function validateAssetKey(assetKey: string) {
197
- if (assetKey.length > 512) {
198
- throw new Error(
199
- `The asset path key "${assetKey}" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits",`
200
- );
201
- }
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
+ }
202
266
  }
203
267
 
204
268
  /**
@@ -207,16 +271,31 @@ function validateAssetKey(assetKey: string) {
207
271
  * Primarily this involves converting Windows backslashes to forward slashes.
208
272
  */
209
273
  function urlSafe(filePath: string): string {
210
- return filePath.replace(/\\/g, "/");
274
+ return filePath.replace(/\\/g, "/");
211
275
  }
212
276
 
213
277
  /**
214
278
  * Information about the assets that should be uploaded
215
279
  */
216
280
  export interface AssetPaths {
217
- baseDirectory: string;
218
- includePatterns: string[];
219
- excludePatterns: string[];
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[];
220
299
  }
221
300
 
222
301
  /**
@@ -225,19 +304,69 @@ export interface AssetPaths {
225
304
  * Uses the args (passed from the command line) if available,
226
305
  * falling back to those defined in the config.
227
306
  *
228
- * // TODO: Support for environments
307
+ * (This function corresponds to --assets/config.assets)
308
+ *
229
309
  */
230
310
  export function getAssetPaths(
231
- config: Config,
232
- baseDirectory = config.site?.bucket,
233
- includePatterns = config.site?.include ?? [],
234
- excludePatterns = config.site?.exclude ?? []
235
- ): undefined | AssetPaths {
236
- return baseDirectory
237
- ? {
238
- baseDirectory,
239
- includePatterns,
240
- excludePatterns,
241
- }
242
- : undefined;
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
+ }
243
372
  }