wrangler 0.0.0-e30d1013 → 0.0.0-e3136f935

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 (270) hide show
  1. package/README.md +17 -15
  2. package/bin/wrangler.js +24 -93
  3. package/config-schema.json +3115 -0
  4. package/package.json +197 -192
  5. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  6. package/templates/__tests__/tsconfig.json +8 -0
  7. package/templates/checked-fetch.js +19 -6
  8. package/templates/facade.d.ts +19 -0
  9. package/templates/gitignore +2 -3
  10. package/templates/init-tests/test-jest-new-worker.js +3 -5
  11. package/templates/init-tests/test-vitest-new-worker.js +4 -6
  12. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  13. package/templates/middleware/common.ts +9 -4
  14. package/templates/middleware/loader-modules.ts +94 -44
  15. package/templates/middleware/loader-sw.ts +48 -32
  16. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  17. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  18. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  19. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  20. package/templates/middleware/middleware-scheduled.ts +15 -1
  21. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  22. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  23. package/templates/modules-watch-stub.js +4 -0
  24. package/templates/new-worker-scheduled.ts +1 -1
  25. package/templates/new-worker.ts +4 -1
  26. package/templates/pages-dev-pipeline.ts +6 -2
  27. package/templates/pages-dev-util.ts +4 -1
  28. package/templates/pages-shim.ts +1 -1
  29. package/templates/pages-template-plugin.ts +33 -14
  30. package/templates/pages-template-worker.ts +12 -3
  31. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  32. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  33. package/templates/tsconfig-sanity.ts +11 -0
  34. package/templates/tsconfig.init.json +22 -0
  35. package/templates/tsconfig.json +5 -103
  36. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  37. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  38. package/wrangler-dist/ProxyWorker.js +241 -0
  39. package/wrangler-dist/ProxyWorker.js.map +6 -0
  40. package/wrangler-dist/cli.d.ts +26093 -517
  41. package/wrangler-dist/cli.js +173222 -119058
  42. package/wrangler-dist/wasm-sync.wasm +0 -0
  43. package/Cloudflare_CA.pem +0 -18
  44. package/import_meta_url.js +0 -3
  45. package/miniflare-config-stubs/.env.empty +0 -0
  46. package/miniflare-config-stubs/package.empty.json +0 -1
  47. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  48. package/miniflare-dist/index.mjs +0 -6316
  49. package/src/__tests__/access.test.ts +0 -25
  50. package/src/__tests__/api-dev.test.ts +0 -209
  51. package/src/__tests__/api-devregistry.test.js +0 -56
  52. package/src/__tests__/api.test.ts +0 -80
  53. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  54. package/src/__tests__/config-cache.test.ts +0 -42
  55. package/src/__tests__/configuration.test.ts +0 -3981
  56. package/src/__tests__/d1.test.ts +0 -74
  57. package/src/__tests__/delete.test.ts +0 -230
  58. package/src/__tests__/deployments.test.ts +0 -91
  59. package/src/__tests__/dev.test.tsx +0 -1509
  60. package/src/__tests__/dialogs.test.tsx +0 -40
  61. package/src/__tests__/generate.test.ts +0 -235
  62. package/src/__tests__/get-host-from-url.test.ts +0 -16
  63. package/src/__tests__/guess-worker-format.test.ts +0 -85
  64. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  65. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  66. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  67. package/src/__tests__/helpers/mock-bin.ts +0 -36
  68. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  69. package/src/__tests__/helpers/mock-console.ts +0 -106
  70. package/src/__tests__/helpers/mock-dialogs.ts +0 -153
  71. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -8
  72. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  73. package/src/__tests__/helpers/mock-istty.ts +0 -74
  74. package/src/__tests__/helpers/mock-known-routes.ts +0 -7
  75. package/src/__tests__/helpers/mock-kv.ts +0 -33
  76. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -252
  77. package/src/__tests__/helpers/mock-process.ts +0 -39
  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/handlers/access.ts +0 -13
  81. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -59
  82. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -104
  83. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -36
  84. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -80
  85. package/src/__tests__/helpers/msw/handlers/script.ts +0 -75
  86. package/src/__tests__/helpers/msw/handlers/user.ts +0 -63
  87. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -22
  88. package/src/__tests__/helpers/msw/index.ts +0 -21
  89. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  90. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  91. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  92. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  93. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  94. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  95. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  96. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  97. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  98. package/src/__tests__/https-options.test.ts +0 -163
  99. package/src/__tests__/index.test.ts +0 -262
  100. package/src/__tests__/init.test.ts +0 -2900
  101. package/src/__tests__/jest.setup.ts +0 -202
  102. package/src/__tests__/kv.test.ts +0 -1675
  103. package/src/__tests__/logger.test.ts +0 -141
  104. package/src/__tests__/metrics.test.ts +0 -450
  105. package/src/__tests__/middleware.scheduled.test.ts +0 -135
  106. package/src/__tests__/middleware.test.ts +0 -726
  107. package/src/__tests__/package-manager.test.ts +0 -353
  108. package/src/__tests__/pages.test.ts +0 -2387
  109. package/src/__tests__/parse.test.ts +0 -330
  110. package/src/__tests__/paths.test.ts +0 -39
  111. package/src/__tests__/publish.test.ts +0 -7633
  112. package/src/__tests__/pubsub.test.ts +0 -370
  113. package/src/__tests__/queues.test.ts +0 -371
  114. package/src/__tests__/r2.test.ts +0 -393
  115. package/src/__tests__/route.test.ts +0 -45
  116. package/src/__tests__/secret.test.ts +0 -644
  117. package/src/__tests__/tail.test.ts +0 -800
  118. package/src/__tests__/test-old-node-version.js +0 -31
  119. package/src/__tests__/type-generation.test.ts +0 -225
  120. package/src/__tests__/user.test.ts +0 -155
  121. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  122. package/src/__tests__/validate-dev-props.test.ts +0 -56
  123. package/src/__tests__/version.test.ts +0 -35
  124. package/src/__tests__/whoami.test.tsx +0 -278
  125. package/src/__tests__/worker-namespace.test.ts +0 -326
  126. package/src/abort.d.ts +0 -3
  127. package/src/api/dev.ts +0 -208
  128. package/src/api/index.ts +0 -2
  129. package/src/bundle-reporter.tsx +0 -68
  130. package/src/bundle.ts +0 -815
  131. package/src/cfetch/index.ts +0 -160
  132. package/src/cfetch/internal.ts +0 -263
  133. package/src/cli.ts +0 -28
  134. package/src/config/README.md +0 -107
  135. package/src/config/config.ts +0 -275
  136. package/src/config/diagnostics.ts +0 -80
  137. package/src/config/environment.ts +0 -561
  138. package/src/config/index.ts +0 -334
  139. package/src/config/validation-helpers.ts +0 -597
  140. package/src/config/validation.ts +0 -2103
  141. package/src/config-cache.ts +0 -85
  142. package/src/create-worker-preview.ts +0 -282
  143. package/src/create-worker-upload-form.ts +0 -316
  144. package/src/d1/backups.tsx +0 -218
  145. package/src/d1/constants.ts +0 -2
  146. package/src/d1/create.tsx +0 -63
  147. package/src/d1/delete.tsx +0 -56
  148. package/src/d1/execute.tsx +0 -344
  149. package/src/d1/formatTimeAgo.ts +0 -14
  150. package/src/d1/index.ts +0 -99
  151. package/src/d1/list.tsx +0 -48
  152. package/src/d1/migrations.tsx +0 -446
  153. package/src/d1/options.ts +0 -22
  154. package/src/d1/types.tsx +0 -24
  155. package/src/d1/utils.ts +0 -48
  156. package/src/delete.ts +0 -108
  157. package/src/deployments.ts +0 -77
  158. package/src/deprecated/index.ts +0 -438
  159. package/src/dev/dev-vars.ts +0 -39
  160. package/src/dev/dev.tsx +0 -587
  161. package/src/dev/get-local-persistence-path.tsx +0 -31
  162. package/src/dev/local.tsx +0 -746
  163. package/src/dev/remote.tsx +0 -603
  164. package/src/dev/start-server.ts +0 -519
  165. package/src/dev/use-esbuild.ts +0 -204
  166. package/src/dev/validate-dev-props.ts +0 -31
  167. package/src/dev-registry.tsx +0 -201
  168. package/src/dev.tsx +0 -868
  169. package/src/dialogs.tsx +0 -169
  170. package/src/dispatch-namespace.ts +0 -207
  171. package/src/durable.ts +0 -102
  172. package/src/entry.ts +0 -329
  173. package/src/environment-variables.ts +0 -50
  174. package/src/errors.ts +0 -11
  175. package/src/git-client.ts +0 -124
  176. package/src/global-wrangler-config-path.ts +0 -26
  177. package/src/https-options.ts +0 -127
  178. package/src/index.tsx +0 -683
  179. package/src/init.ts +0 -970
  180. package/src/inspect.ts +0 -767
  181. package/src/intl-polyfill.d.ts +0 -139
  182. package/src/is-ci.ts +0 -14
  183. package/src/is-interactive.ts +0 -16
  184. package/src/kv/helpers.ts +0 -430
  185. package/src/kv/index.ts +0 -596
  186. package/src/logger.ts +0 -92
  187. package/src/metrics/index.ts +0 -5
  188. package/src/metrics/metrics-config.ts +0 -239
  189. package/src/metrics/metrics-dispatcher.ts +0 -96
  190. package/src/metrics/metrics-usage-headers.ts +0 -24
  191. package/src/metrics/send-event.ts +0 -94
  192. package/src/miniflare-cli/README.md +0 -30
  193. package/src/miniflare-cli/assets.ts +0 -215
  194. package/src/miniflare-cli/index.ts +0 -213
  195. package/src/miniflare-cli/request-context.ts +0 -40
  196. package/src/module-collection.ts +0 -267
  197. package/src/open-in-browser.ts +0 -17
  198. package/src/package-manager.ts +0 -219
  199. package/src/pages/build.tsx +0 -270
  200. package/src/pages/constants.ts +0 -18
  201. package/src/pages/deployments.tsx +0 -106
  202. package/src/pages/dev.tsx +0 -708
  203. package/src/pages/errors.ts +0 -66
  204. package/src/pages/functions/buildPlugin.ts +0 -106
  205. package/src/pages/functions/buildWorker.ts +0 -165
  206. package/src/pages/functions/filepath-routing.test.ts +0 -234
  207. package/src/pages/functions/filepath-routing.ts +0 -189
  208. package/src/pages/functions/identifiers.ts +0 -78
  209. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  210. package/src/pages/functions/routes-consolidation.ts +0 -73
  211. package/src/pages/functions/routes-transformation.test.ts +0 -282
  212. package/src/pages/functions/routes-transformation.ts +0 -115
  213. package/src/pages/functions/routes-validation.test.ts +0 -403
  214. package/src/pages/functions/routes-validation.ts +0 -202
  215. package/src/pages/functions/routes.ts +0 -151
  216. package/src/pages/functions.tsx +0 -82
  217. package/src/pages/hash.tsx +0 -13
  218. package/src/pages/index.tsx +0 -94
  219. package/src/pages/projects.tsx +0 -169
  220. package/src/pages/publish.tsx +0 -446
  221. package/src/pages/types.ts +0 -49
  222. package/src/pages/upload.tsx +0 -425
  223. package/src/pages/utils.ts +0 -12
  224. package/src/parse.ts +0 -286
  225. package/src/paths.ts +0 -71
  226. package/src/proxy.ts +0 -689
  227. package/src/publish/index.ts +0 -270
  228. package/src/publish/publish.ts +0 -1035
  229. package/src/pubsub/index.ts +0 -286
  230. package/src/pubsub/pubsub-commands.tsx +0 -624
  231. package/src/queues/cli/commands/consumer/add.ts +0 -71
  232. package/src/queues/cli/commands/consumer/index.ts +0 -22
  233. package/src/queues/cli/commands/consumer/remove.ts +0 -38
  234. package/src/queues/cli/commands/create.ts +0 -25
  235. package/src/queues/cli/commands/delete.ts +0 -26
  236. package/src/queues/cli/commands/index.ts +0 -33
  237. package/src/queues/cli/commands/list.ts +0 -25
  238. package/src/queues/client.ts +0 -135
  239. package/src/r2/constants.ts +0 -4
  240. package/src/r2/helpers.ts +0 -131
  241. package/src/r2/index.ts +0 -289
  242. package/src/routes.ts +0 -140
  243. package/src/secret/index.ts +0 -378
  244. package/src/selfsigned.d.ts +0 -29
  245. package/src/sites.tsx +0 -372
  246. package/src/tail/createTail.ts +0 -315
  247. package/src/tail/filters.ts +0 -277
  248. package/src/tail/index.ts +0 -214
  249. package/src/tail/printing.ts +0 -107
  250. package/src/type-generation.ts +0 -173
  251. package/src/update-check.ts +0 -19
  252. package/src/user/access.ts +0 -69
  253. package/src/user/choose-account.tsx +0 -69
  254. package/src/user/env-vars.ts +0 -46
  255. package/src/user/generate-auth-url.ts +0 -33
  256. package/src/user/generate-random-state.ts +0 -16
  257. package/src/user/index.ts +0 -3
  258. package/src/user/user.tsx +0 -1192
  259. package/src/utils/collectKeyValues.ts +0 -14
  260. package/src/whoami.tsx +0 -169
  261. package/src/worker.ts +0 -245
  262. package/src/yargs-types.ts +0 -20
  263. package/src/zones.ts +0 -191
  264. package/templates/d1-beta-facade.js +0 -196
  265. package/templates/experimental-local-cache-stubs.js +0 -27
  266. package/templates/first-party-worker-module-facade.ts +0 -18
  267. package/templates/format-dev-errors.ts +0 -32
  268. package/templates/serve-static-assets.ts +0 -63
  269. package/templates/service-bindings-module-facade.js +0 -54
  270. package/templates/service-bindings-sw-facade.js +0 -42
package/src/sites.tsx 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 1.
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
- }
@@ -1,315 +0,0 @@
1
- import WebSocket from "ws";
2
- import { version as packageVersion } from "../../package.json";
3
- import { fetchResult } from "../cfetch";
4
- import type { TailFilterMessage, Outcome } from "./filters";
5
- export type { TailCLIFilters } from "./filters";
6
- export { translateCLICommandToFilterMessage } from "./filters";
7
- export { jsonPrintLogs, prettyPrintLogs } from "./printing";
8
- import type { Request } from "undici";
9
-
10
- /**
11
- * When creating a Tail, the response from the API contains
12
- * - an ID used for identifying the tail
13
- * - a URL to a WebSocket connection available for the tail to connect to
14
- * - an expiration date when the tail is no longer guaranteed to be valid
15
- */
16
- type TailCreationApiResponse = {
17
- id: string;
18
- url: string;
19
- expires_at: Date;
20
- };
21
-
22
- /**
23
- * Generate a URL that, when `cfetch`ed, creates a tail.
24
- *
25
- * https://api.cloudflare.com/#worker-tail-logs-start-tail
26
- *
27
- * @param accountId the account ID associated with the worker to tail
28
- * @param workerName the name of the worker to tail
29
- * @returns a `cfetch`-ready URL for creating a new tail
30
- */
31
- function makeCreateTailUrl(
32
- accountId: string,
33
- workerName: string,
34
- env: string | undefined
35
- ): string {
36
- return env
37
- ? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails`
38
- : `/accounts/${accountId}/workers/scripts/${workerName}/tails`;
39
- }
40
-
41
- /**
42
- * Generate a URL that, when `cfetch`ed, deletes a tail
43
- *
44
- * https://api.cloudflare.com/#worker-tail-logs-delete-tail
45
- *
46
- * @param accountId the account ID associated with the worker we're tailing
47
- * @param workerName the name of the worker we're tailing
48
- * @param tailId the ID of the tail we want to delete
49
- * @returns a `cfetch`-ready URL for deleting a tail
50
- */
51
- function makeDeleteTailUrl(
52
- accountId: string,
53
- workerName: string,
54
- tailId: string,
55
- env: string | undefined
56
- ): string {
57
- return env
58
- ? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails/${tailId}`
59
- : `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
60
- }
61
-
62
- /**
63
- * Create and connect to a tail.
64
- *
65
- * Under the hood, this function
66
- * - Registers a new Tail with the API
67
- * - Connects to the tail worker
68
- * - Sends any filters over the connection
69
- *
70
- * @param accountId the account ID associated with the worker to tail
71
- * @param workerName the name of the worker to tail
72
- * @param filters A list of `TailAPIFilters` given to the tail
73
- * @param debug Flag to run tail in debug mode
74
- * @returns a websocket connection, an expiration, and a function to call to delete the tail
75
- */
76
- export async function createTail(
77
- accountId: string,
78
- workerName: string,
79
- filters: TailFilterMessage,
80
- debug: boolean,
81
- env: string | undefined
82
- ): Promise<{
83
- tail: WebSocket;
84
- expiration: Date;
85
- deleteTail: () => Promise<void>;
86
- }> {
87
- // create the tail
88
- const createTailUrl = makeCreateTailUrl(accountId, workerName, env);
89
- const {
90
- id: tailId,
91
- url: websocketUrl,
92
- expires_at: expiration,
93
- } = await fetchResult<TailCreationApiResponse>(createTailUrl, {
94
- method: "POST",
95
- body: JSON.stringify(filters),
96
- });
97
-
98
- // delete the tail (not yet!)
99
- const deleteUrl = makeDeleteTailUrl(accountId, workerName, tailId, env);
100
- async function deleteTail() {
101
- await fetchResult(deleteUrl, { method: "DELETE" });
102
- }
103
-
104
- // connect to the tail
105
- const tail = new WebSocket(websocketUrl, "trace-v1", {
106
- headers: {
107
- "Sec-WebSocket-Protocol": "trace-v1", // needs to be `trace-v1` to be accepted
108
- "User-Agent": `wrangler-js/${packageVersion}`,
109
- },
110
- });
111
-
112
- // send filters when we open up
113
- tail.on("open", function () {
114
- tail.send(
115
- JSON.stringify({ debug: debug }),
116
- { binary: false, compress: false, mask: false, fin: true },
117
- (err) => {
118
- if (err) {
119
- throw err;
120
- }
121
- }
122
- );
123
- });
124
-
125
- return { tail, expiration, deleteTail };
126
- }
127
-
128
- /**
129
- * Everything captured by the trace worker and sent to us via
130
- * `wrangler tail` is structured JSON that deserializes to this type.
131
- */
132
- export type TailEventMessage = {
133
- /**
134
- * Whether the execution of this worker succeeded or failed
135
- */
136
- outcome: Outcome;
137
-
138
- /**
139
- * The name of the script we're tailing
140
- */
141
- scriptName?: string;
142
-
143
- /**
144
- * Any exceptions raised by the worker
145
- */
146
- exceptions: {
147
- /**
148
- * The name of the exception.
149
- */
150
- name: string;
151
-
152
- /**
153
- * The error message
154
- */
155
- message: unknown;
156
-
157
- /**
158
- * When the exception was raised/thrown
159
- */
160
- timestamp: number;
161
- }[];
162
-
163
- /**
164
- * Any logs sent out by the worker
165
- */
166
- logs: {
167
- message: unknown[];
168
- level: string; // TODO: make this a union of possible values
169
- timestamp: number;
170
- }[];
171
-
172
- /**
173
- * When the event was triggered
174
- */
175
- eventTimestamp: number;
176
-
177
- /**
178
- * The event that triggered the worker. In the case of an HTTP request,
179
- * this will be a RequestEvent. If it's a cron trigger, it'll be a
180
- * ScheduledEvent. If it's a durable object alarm, it's an AlarmEvent.
181
- *
182
- * Until workers-types exposes individual types for export, we'll have
183
- * to just re-define these types ourselves.
184
- */
185
- event: RequestEvent | ScheduledEvent | AlarmEvent | undefined | null;
186
- };
187
-
188
- /**
189
- * A request that triggered worker execution
190
- */
191
-
192
- export type RequestEvent = {
193
- request: Pick<Request, "url" | "method" | "headers"> & {
194
- /**
195
- * Cloudflare-specific properties
196
- * https://developers.cloudflare.com/workers/runtime-apis/request#incomingrequestcfproperties
197
- */
198
- cf: {
199
- /**
200
- * How long (in ms) it took for the client's TCP connection to make a
201
- * round trip to the worker and back. For all my gamers out there,
202
- * this is the request's ping
203
- */
204
- clientTcpRtt?: number;
205
-
206
- /**
207
- * Longitude and Latitude of where the request originated from
208
- */
209
- longitude?: string;
210
- latitude?: string;
211
-
212
- /**
213
- * What cipher was used to establish the TLS connection
214
- */
215
- tlsCipher: string;
216
-
217
- /**
218
- * Which continent the request came from.
219
- */
220
- continent?: "NA";
221
-
222
- /**
223
- * ASN of the incoming request
224
- */
225
- asn: number;
226
-
227
- /**
228
- * The country the incoming request is coming from
229
- */
230
- country?: string;
231
-
232
- /**
233
- * The TLS version the connection used
234
- */
235
- tlsVersion: string;
236
-
237
- /**
238
- * The colo that processed the request (i.e. the airport code
239
- * of the closest city to the server that spun up the worker)
240
- */
241
- colo: string;
242
-
243
- /**
244
- * The timezone where the request came from
245
- */
246
- timezone?: string;
247
-
248
- /**
249
- * The city where the request came from
250
- */
251
- city?: string;
252
-
253
- /**
254
- * The browser-requested prioritization information in the request object
255
- */
256
- requestPriority?: string;
257
-
258
- /**
259
- * Which version of HTTP the request came over e.g. "HTTP/2"
260
- */
261
- httpProtocol: string;
262
-
263
- /**
264
- * The region where the request originated from
265
- */
266
- region?: string;
267
- regionCode?: string;
268
-
269
- /**
270
- * The organization which owns the ASN of the incoming request, for example, Google Cloud.
271
- */
272
- asOrganization: string;
273
-
274
- /**
275
- * Metro code (DMA) of the incoming request, for example, "635".
276
- */
277
- metroCode?: string;
278
-
279
- /**
280
- * Postal code of the incoming request, for example, "78701".
281
- */
282
- postalCode?: string;
283
- };
284
- };
285
- };
286
-
287
- /**
288
- * An event that was triggered at a certain time
289
- */
290
- export type ScheduledEvent = {
291
- /**
292
- * The cron pattern that matched when this event fired
293
- */
294
- cron: string;
295
-
296
- /**
297
- * The time this worker was scheduled to run.
298
- * For some reason, this doesn't...work correctly when we
299
- * do it directly as a Date. So parse it later on your own.
300
- */
301
- scheduledTime: number;
302
- };
303
-
304
- /**
305
- * A event that was triggered from a durable object alarm
306
- */
307
- export type AlarmEvent = {
308
- /**
309
- * The datetime the alarm was scheduled for.
310
- *
311
- * This is sent as an ISO timestamp string (different than ScheduledEvent.scheduledTime),
312
- * you should parse it later on on your own.
313
- */
314
- scheduledTime: string;
315
- };