wrangler 0.0.0-e88a54e → 0.0.0-e8e684c7

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 (222) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +51 -14
  3. package/bin/wrangler.js +161 -29
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +5484 -21
  6. package/package.json +173 -143
  7. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  8. package/src/__tests__/config-cache.test.ts +42 -0
  9. package/src/__tests__/configuration.test.ts +4016 -2786
  10. package/src/__tests__/dev.test.tsx +1305 -483
  11. package/src/__tests__/generate.test.ts +91 -0
  12. package/src/__tests__/guess-worker-format.test.ts +75 -48
  13. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  14. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  15. package/src/__tests__/helpers/mock-bin.ts +20 -20
  16. package/src/__tests__/helpers/mock-cfetch.ts +182 -93
  17. package/src/__tests__/helpers/mock-console.ts +59 -32
  18. package/src/__tests__/helpers/mock-dialogs.ts +121 -33
  19. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  20. package/src/__tests__/helpers/mock-http-server.ts +46 -0
  21. package/src/__tests__/helpers/mock-istty.ts +74 -0
  22. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  23. package/src/__tests__/helpers/mock-kv.ts +26 -26
  24. package/src/__tests__/helpers/mock-oauth-flow.ts +250 -0
  25. package/src/__tests__/helpers/mock-process.ts +39 -0
  26. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  27. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  28. package/src/__tests__/helpers/run-in-tmp.ts +28 -22
  29. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  30. package/src/__tests__/helpers/write-worker-source.ts +31 -0
  31. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  32. package/src/__tests__/https-options.test.ts +144 -108
  33. package/src/__tests__/index.test.ts +229 -975
  34. package/src/__tests__/init.test.ts +2170 -0
  35. package/src/__tests__/jest.setup.ts +122 -34
  36. package/src/__tests__/kv.test.ts +1376 -1087
  37. package/src/__tests__/logger.test.ts +141 -0
  38. package/src/__tests__/metrics.test.ts +450 -0
  39. package/src/__tests__/package-manager.test.ts +312 -165
  40. package/src/__tests__/pages.test.ts +1270 -39
  41. package/src/__tests__/parse.test.ts +253 -245
  42. package/src/__tests__/publish.test.ts +6878 -2627
  43. package/src/__tests__/pubsub.test.ts +367 -0
  44. package/src/__tests__/r2.test.ts +328 -190
  45. package/src/__tests__/route.test.ts +22 -22
  46. package/src/__tests__/secret.test.ts +474 -407
  47. package/src/__tests__/tail.test.ts +679 -441
  48. package/src/__tests__/test-old-node-version.js +31 -0
  49. package/src/__tests__/user.test.ts +155 -0
  50. package/src/__tests__/validate-dev-props.test.ts +56 -0
  51. package/src/__tests__/version.test.ts +35 -0
  52. package/src/__tests__/whoami.test.tsx +276 -87
  53. package/src/__tests__/worker-namespace.test.ts +329 -0
  54. package/src/abort.d.ts +3 -0
  55. package/src/api/dev.ts +93 -0
  56. package/src/api/index.ts +1 -0
  57. package/src/bundle-reporter.tsx +29 -0
  58. package/src/bundle.ts +441 -110
  59. package/src/cfetch/index.ts +83 -66
  60. package/src/cfetch/internal.ts +251 -92
  61. package/src/cli.ts +22 -14
  62. package/src/config/README.md +1 -1
  63. package/src/config/config.ts +224 -179
  64. package/src/config/diagnostics.ts +61 -61
  65. package/src/config/environment.ts +430 -311
  66. package/src/config/index.ts +227 -38
  67. package/src/config/validation-helpers.ts +414 -303
  68. package/src/config/validation.ts +1745 -973
  69. package/src/config-cache.ts +85 -0
  70. package/src/create-worker-preview.ts +209 -118
  71. package/src/create-worker-upload-form.ts +275 -201
  72. package/src/dev/dev-vars.ts +36 -0
  73. package/src/dev/dev.tsx +488 -307
  74. package/src/dev/local.tsx +427 -210
  75. package/src/dev/remote.tsx +407 -188
  76. package/src/dev/use-esbuild.ts +156 -78
  77. package/src/dev/validate-dev-props.ts +31 -0
  78. package/src/dev-registry.tsx +160 -0
  79. package/src/dev.tsx +696 -0
  80. package/src/dialogs.tsx +115 -57
  81. package/src/dispatch-namespace.ts +206 -0
  82. package/src/durable.ts +102 -0
  83. package/src/entry.ts +267 -147
  84. package/src/environment-variables.ts +25 -23
  85. package/src/errors.ts +11 -0
  86. package/src/faye-websocket.d.ts +6 -0
  87. package/src/generate.ts +131 -0
  88. package/src/git-client.ts +42 -0
  89. package/src/global-wrangler-config-path.ts +26 -0
  90. package/src/https-options.ts +85 -80
  91. package/src/index.tsx +2191 -2304
  92. package/src/init.ts +622 -0
  93. package/src/inspect.ts +687 -557
  94. package/src/intl-polyfill.d.ts +139 -0
  95. package/src/is-ci.ts +14 -0
  96. package/src/is-interactive.ts +12 -0
  97. package/src/kv.ts +353 -242
  98. package/src/logger.ts +73 -0
  99. package/src/metrics/index.ts +5 -0
  100. package/src/metrics/metrics-config.ts +239 -0
  101. package/src/metrics/metrics-dispatcher.ts +96 -0
  102. package/src/metrics/metrics-usage-headers.ts +24 -0
  103. package/src/metrics/send-event.ts +92 -0
  104. package/src/miniflare-cli/assets.ts +554 -0
  105. package/src/miniflare-cli/enum-keys.ts +8 -8
  106. package/src/miniflare-cli/index.ts +199 -29
  107. package/src/miniflare-cli/request-context.ts +40 -0
  108. package/src/module-collection.ts +213 -213
  109. package/src/open-in-browser.ts +8 -16
  110. package/src/package-manager.ts +183 -90
  111. package/src/pages/build.tsx +238 -0
  112. package/src/pages/constants.ts +12 -0
  113. package/src/pages/deployments.tsx +106 -0
  114. package/src/pages/dev.tsx +528 -0
  115. package/src/pages/errors.ts +22 -0
  116. package/src/pages/functions/buildPlugin.ts +109 -0
  117. package/src/pages/functions/buildWorker.ts +155 -0
  118. package/src/pages/functions/filepath-routing.test.ts +234 -0
  119. package/src/pages/functions/filepath-routing.ts +189 -0
  120. package/src/pages/functions/identifiers.ts +78 -0
  121. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  122. package/src/pages/functions/routes-consolidation.ts +73 -0
  123. package/src/pages/functions/routes-transformation.test.ts +271 -0
  124. package/src/pages/functions/routes-transformation.ts +122 -0
  125. package/src/pages/functions/routes.ts +151 -0
  126. package/src/pages/functions.tsx +96 -0
  127. package/src/pages/index.tsx +94 -0
  128. package/src/pages/projects.tsx +169 -0
  129. package/src/pages/publish.tsx +391 -0
  130. package/src/pages/types.ts +49 -0
  131. package/src/pages/upload.tsx +413 -0
  132. package/src/pages/utils.ts +12 -0
  133. package/src/parse.ts +224 -121
  134. package/src/paths.ts +6 -6
  135. package/src/preview.ts +31 -0
  136. package/src/proxy.ts +416 -370
  137. package/src/publish.ts +796 -321
  138. package/src/pubsub/index.ts +286 -0
  139. package/src/pubsub/pubsub-commands.tsx +623 -0
  140. package/src/r2.ts +100 -19
  141. package/src/selfsigned.d.ts +23 -23
  142. package/src/sites.tsx +281 -189
  143. package/src/tail/filters.ts +111 -109
  144. package/src/tail/index.ts +230 -217
  145. package/src/tail/printing.ts +92 -47
  146. package/src/update-check.ts +19 -0
  147. package/src/user/choose-account.tsx +69 -0
  148. package/src/user/env-vars.ts +46 -0
  149. package/src/user/generate-auth-url.ts +33 -0
  150. package/src/user/generate-random-state.ts +16 -0
  151. package/src/user/index.ts +3 -0
  152. package/src/user/user.tsx +1191 -0
  153. package/src/whoami.tsx +142 -42
  154. package/src/worker.ts +135 -94
  155. package/src/zones.ts +167 -0
  156. package/templates/checked-fetch.js +17 -0
  157. package/templates/first-party-worker-module-facade.ts +18 -0
  158. package/templates/format-dev-errors.ts +32 -0
  159. package/templates/gitignore +171 -0
  160. package/templates/new-worker-scheduled.js +17 -0
  161. package/templates/new-worker-scheduled.ts +32 -0
  162. package/templates/new-worker.js +3 -3
  163. package/templates/new-worker.ts +18 -3
  164. package/templates/no-op-worker.js +10 -0
  165. package/templates/pages-shim.ts +9 -0
  166. package/templates/pages-template-plugin.ts +167 -0
  167. package/templates/pages-template-worker.ts +172 -0
  168. package/templates/serve-static-assets.ts +63 -0
  169. package/templates/service-bindings-module-facade.js +54 -0
  170. package/templates/service-bindings-sw-facade.js +42 -0
  171. package/templates/tsconfig.json +95 -95
  172. package/wrangler-dist/cli.d.ts +338 -0
  173. package/wrangler-dist/cli.js +124611 -112403
  174. package/miniflare-dist/index.mjs.map +0 -7
  175. package/pages/functions/buildWorker.ts +0 -62
  176. package/pages/functions/filepath-routing.test.ts +0 -223
  177. package/pages/functions/filepath-routing.ts +0 -181
  178. package/pages/functions/identifiers.ts +0 -78
  179. package/pages/functions/routes.ts +0 -151
  180. package/pages/functions/template-worker.ts +0 -130
  181. package/src/__tests__/dev2.test.tsx +0 -154
  182. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  183. package/src/__tests__/logout.test.ts +0 -52
  184. package/src/__tests__/sentry.test.ts +0 -146
  185. package/src/pages.tsx +0 -1047
  186. package/src/reporting.ts +0 -131
  187. package/src/user.tsx +0 -1118
  188. package/templates/static-asset-facade.js +0 -47
  189. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  190. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  191. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  192. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  193. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  194. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  195. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  196. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  197. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  198. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  199. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  200. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  201. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  202. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  203. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  204. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  205. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  206. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  207. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  208. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  209. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  210. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  211. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  212. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  213. package/vendor/wrangler-mime/LICENSE +0 -21
  214. package/vendor/wrangler-mime/Mime.js +0 -97
  215. package/vendor/wrangler-mime/README.md +0 -187
  216. package/vendor/wrangler-mime/cli.js +0 -46
  217. package/vendor/wrangler-mime/index.js +0 -4
  218. package/vendor/wrangler-mime/lite.js +0 -4
  219. package/vendor/wrangler-mime/package.json +0 -52
  220. package/vendor/wrangler-mime/types/other.js +0 -1
  221. package/vendor/wrangler-mime/types/standard.js +0 -1
  222. package/wrangler-dist/cli.js.map +0 -7
@@ -0,0 +1,554 @@
1
+ import { existsSync, lstatSync, readFileSync } from "node:fs";
2
+ import { join } from "node:path";
3
+ import { fetch as miniflareFetch } from "@miniflare/core";
4
+ import { watch } from "chokidar";
5
+ import { getType } from "mime";
6
+ import { Response } from "miniflare";
7
+ import type { Headers as MiniflareHeaders } from "@miniflare/core";
8
+ import type { Log } from "miniflare";
9
+ import type {
10
+ Request as MiniflareRequest,
11
+ RequestInfo,
12
+ RequestInit,
13
+ } from "miniflare";
14
+
15
+ export interface Options {
16
+ log: Log;
17
+ proxyPort?: number;
18
+ directory?: string;
19
+ }
20
+
21
+ export default async function generateASSETSBinding(options: Options) {
22
+ const assetsFetch =
23
+ options.directory !== undefined
24
+ ? await generateAssetsFetch(options.directory, options.log)
25
+ : invalidAssetsFetch;
26
+
27
+ return async function (request: MiniflareRequest) {
28
+ if (options.proxyPort) {
29
+ try {
30
+ const url = new URL(request.url);
31
+ url.host = `localhost:${options.proxyPort}`;
32
+ return await miniflareFetch(url, request);
33
+ } catch (thrown) {
34
+ options.log.error(new Error(`Could not proxy request: ${thrown}`));
35
+
36
+ // TODO: Pretty error page
37
+ return new Response(`[wrangler] Could not proxy request: ${thrown}`, {
38
+ status: 502,
39
+ });
40
+ }
41
+ } else {
42
+ try {
43
+ return await assetsFetch(request);
44
+ } catch (thrown) {
45
+ options.log.error(new Error(`Could not serve static asset: ${thrown}`));
46
+
47
+ // TODO: Pretty error page
48
+ return new Response(
49
+ `[wrangler] Could not serve static asset: ${thrown}`,
50
+ { status: 502 }
51
+ );
52
+ }
53
+ }
54
+ };
55
+ }
56
+
57
+ function escapeRegex(str: string) {
58
+ return str.replace(/[-/\\^$*+?.()|[]{}]/g, "\\$&");
59
+ }
60
+
61
+ type Replacements = Record<string, string>;
62
+
63
+ function replacer(str: string, replacements: Replacements) {
64
+ for (const [replacement, value] of Object.entries(replacements)) {
65
+ str = str.replace(`:${replacement}`, value);
66
+ }
67
+ return str;
68
+ }
69
+
70
+ function generateRulesMatcher<T>(
71
+ rules?: Record<string, T>,
72
+ replacerFn: (match: T, replacements: Replacements) => T = (match) => match
73
+ ) {
74
+ // TODO: How can you test cross-host rules?
75
+ if (!rules) return () => [];
76
+
77
+ const compiledRules = Object.entries(rules)
78
+ .map(([rule, match]) => {
79
+ const crossHost = rule.startsWith("https://");
80
+
81
+ rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
82
+
83
+ const host_matches = rule.matchAll(
84
+ /(?<=^https:\\\/\\\/[^/]*?):([^\\]+)(?=\\)/g
85
+ );
86
+ for (const hostMatch of host_matches) {
87
+ rule = rule.split(hostMatch[0]).join(`(?<${hostMatch[1]}>[^/.]+)`);
88
+ }
89
+
90
+ const path_matches = rule.matchAll(/:(\w+)/g);
91
+ for (const pathMatch of path_matches) {
92
+ rule = rule.split(pathMatch[0]).join(`(?<${pathMatch[1]}>[^/]+)`);
93
+ }
94
+
95
+ rule = "^" + rule + "$";
96
+
97
+ try {
98
+ const regExp = new RegExp(rule);
99
+ return [{ crossHost, regExp }, match];
100
+ } catch {}
101
+ })
102
+ .filter((value) => value !== undefined) as [
103
+ { crossHost: boolean; regExp: RegExp },
104
+ T
105
+ ][];
106
+
107
+ return ({ request }: { request: MiniflareRequest }) => {
108
+ const { pathname, host } = new URL(request.url);
109
+
110
+ return compiledRules
111
+ .map(([{ crossHost, regExp }, match]) => {
112
+ const test = crossHost ? `https://${host}${pathname}` : pathname;
113
+ const result = regExp.exec(test);
114
+ if (result) {
115
+ return replacerFn(match, result.groups || {});
116
+ }
117
+ })
118
+ .filter((value) => value !== undefined) as T[];
119
+ };
120
+ }
121
+
122
+ function generateHeadersMatcher(headersFile: string) {
123
+ if (existsSync(headersFile)) {
124
+ const contents = readFileSync(headersFile).toString();
125
+
126
+ // TODO: Log errors
127
+ const lines = contents
128
+ .split("\n")
129
+ .map((line) => line.trim())
130
+ .filter((line) => !line.startsWith("#") && line !== "");
131
+
132
+ const rules: Record<string, Record<string, string>> = {};
133
+ let rule: { path: string; headers: Record<string, string> } | undefined =
134
+ undefined;
135
+
136
+ for (const line of lines) {
137
+ if (/^([^\s]+:\/\/|^\/)/.test(line)) {
138
+ if (rule && Object.keys(rule.headers).length > 0) {
139
+ rules[rule.path] = rule.headers;
140
+ }
141
+
142
+ const path = validateURL(line);
143
+ if (path) {
144
+ rule = {
145
+ path,
146
+ headers: {},
147
+ };
148
+ continue;
149
+ }
150
+ }
151
+
152
+ if (!line.includes(":")) continue;
153
+
154
+ const [rawName, ...rawValue] = line.split(":");
155
+ const name = rawName.trim().toLowerCase();
156
+ const value = rawValue.join(":").trim();
157
+
158
+ if (name === "") continue;
159
+ if (!rule) continue;
160
+
161
+ const existingValues = rule.headers[name];
162
+ rule.headers[name] = existingValues
163
+ ? `${existingValues}, ${value}`
164
+ : value;
165
+ }
166
+
167
+ if (rule && Object.keys(rule.headers).length > 0) {
168
+ rules[rule.path] = rule.headers;
169
+ }
170
+
171
+ const rulesMatcher = generateRulesMatcher(rules, (match, replacements) =>
172
+ Object.fromEntries(
173
+ Object.entries(match).map(([name, value]) => [
174
+ name,
175
+ replacer(value, replacements),
176
+ ])
177
+ )
178
+ );
179
+
180
+ return (request: MiniflareRequest) => {
181
+ const matches = rulesMatcher({
182
+ request,
183
+ });
184
+ if (matches) return matches;
185
+ };
186
+ } else {
187
+ return () => undefined;
188
+ }
189
+ }
190
+
191
+ function generateRedirectsMatcher(redirectsFile: string) {
192
+ if (existsSync(redirectsFile)) {
193
+ const contents = readFileSync(redirectsFile).toString();
194
+
195
+ // TODO: Log errors
196
+ const lines = contents
197
+ .split("\n")
198
+ .map((line) => line.trim())
199
+ .filter((line) => !line.startsWith("#") && line !== "");
200
+
201
+ const rules = Object.fromEntries(
202
+ lines
203
+ .map((line) => line.split(" "))
204
+ .filter((tokens) => tokens.length === 2 || tokens.length === 3)
205
+ .map((tokens) => {
206
+ const from = validateURL(tokens[0], true, false, false);
207
+ const to = validateURL(tokens[1], false, true, true);
208
+ let status: number | undefined = parseInt(tokens[2]) || 302;
209
+ status = [301, 302, 303, 307, 308].includes(status)
210
+ ? status
211
+ : undefined;
212
+
213
+ return from && to && status ? [from, { to, status }] : undefined;
214
+ })
215
+ .filter((rule) => rule !== undefined) as [
216
+ string,
217
+ { to: string; status?: number }
218
+ ][]
219
+ );
220
+
221
+ const rulesMatcher = generateRulesMatcher(
222
+ rules,
223
+ ({ status, to }, replacements) => ({
224
+ status,
225
+ to: replacer(to, replacements),
226
+ })
227
+ );
228
+
229
+ return (request: MiniflareRequest) => {
230
+ const match = rulesMatcher({
231
+ request,
232
+ })[0];
233
+ if (match) return match;
234
+ };
235
+ } else {
236
+ return () => undefined;
237
+ }
238
+ }
239
+
240
+ function extractPathname(
241
+ path = "/",
242
+ includeSearch: boolean,
243
+ includeHash: boolean
244
+ ) {
245
+ if (!path.startsWith("/")) path = `/${path}`;
246
+ const url = new URL(`//${path}`, "relative://");
247
+ return `${url.pathname}${includeSearch ? url.search : ""}${
248
+ includeHash ? url.hash : ""
249
+ }`;
250
+ }
251
+
252
+ function validateURL(
253
+ token: string,
254
+ onlyRelative = false,
255
+ includeSearch = false,
256
+ includeHash = false
257
+ ) {
258
+ const host = /^https:\/\/+(?<host>[^/]+)\/?(?<path>.*)/.exec(token);
259
+ if (host && host.groups && host.groups.host) {
260
+ if (onlyRelative) return;
261
+
262
+ return `https://${host.groups.host}${extractPathname(
263
+ host.groups.path,
264
+ includeSearch,
265
+ includeHash
266
+ )}`;
267
+ } else {
268
+ if (!token.startsWith("/") && onlyRelative) token = `/${token}`;
269
+
270
+ const path = /^\//.exec(token);
271
+ if (path) {
272
+ try {
273
+ return extractPathname(token, includeSearch, includeHash);
274
+ } catch {}
275
+ }
276
+ }
277
+ return "";
278
+ }
279
+
280
+ function hasFileExtension(pathname: string) {
281
+ return /\/.+\.[a-z0-9]+$/i.test(pathname);
282
+ }
283
+
284
+ async function generateAssetsFetch(
285
+ directory: string,
286
+ log: Log
287
+ ): Promise<typeof miniflareFetch> {
288
+ // Defer importing miniflare until we really need it
289
+ const { Headers, Request } = await import("@miniflare/core");
290
+
291
+ const headersFile = join(directory, "_headers");
292
+ const redirectsFile = join(directory, "_redirects");
293
+ const workerFile = join(directory, "_worker.js");
294
+
295
+ const ignoredFiles = [headersFile, redirectsFile, workerFile];
296
+
297
+ const assetExists = (path: string) => {
298
+ path = join(directory, path);
299
+ return (
300
+ existsSync(path) &&
301
+ lstatSync(path).isFile() &&
302
+ !ignoredFiles.includes(path)
303
+ );
304
+ };
305
+
306
+ const getAsset = (path: string) => {
307
+ if (assetExists(path)) {
308
+ return join(directory, path);
309
+ }
310
+ };
311
+
312
+ let redirectsMatcher = generateRedirectsMatcher(redirectsFile);
313
+ let headersMatcher = generateHeadersMatcher(headersFile);
314
+
315
+ watch([headersFile, redirectsFile], {
316
+ persistent: true,
317
+ }).on("change", (path) => {
318
+ switch (path) {
319
+ case headersFile: {
320
+ log.log("_headers modified. Re-evaluating...");
321
+ headersMatcher = generateHeadersMatcher(headersFile);
322
+ break;
323
+ }
324
+ case redirectsFile: {
325
+ log.log("_redirects modified. Re-evaluating...");
326
+ redirectsMatcher = generateRedirectsMatcher(redirectsFile);
327
+ break;
328
+ }
329
+ }
330
+ });
331
+
332
+ const serveAsset = (file: string) => {
333
+ return readFileSync(file);
334
+ };
335
+
336
+ const generateResponse = (request: MiniflareRequest) => {
337
+ const url = new URL(request.url);
338
+ let assetName = url.pathname;
339
+ try {
340
+ //it's possible for someone to send a URL like http://fakehost/abc%2 which would fail to decode
341
+ assetName = decodeURIComponent(url.pathname);
342
+ } catch {}
343
+
344
+ const deconstructedResponse: {
345
+ status: number;
346
+ headers: MiniflareHeaders;
347
+ body?: Buffer;
348
+ } = {
349
+ status: 200,
350
+ headers: new Headers(),
351
+ body: undefined,
352
+ };
353
+
354
+ const match = redirectsMatcher(request);
355
+ if (match) {
356
+ const { status, to } = match;
357
+
358
+ let location = to;
359
+ let search;
360
+
361
+ if (to.startsWith("/")) {
362
+ search = new URL(location, "http://fakehost").search;
363
+ } else {
364
+ search = new URL(location).search;
365
+ }
366
+
367
+ location = `${location}${search ? "" : url.search}`;
368
+
369
+ if (status && [301, 302, 303, 307, 308].includes(status)) {
370
+ deconstructedResponse.status = status;
371
+ } else {
372
+ deconstructedResponse.status = 302;
373
+ }
374
+
375
+ deconstructedResponse.headers.set("Location", location);
376
+ return deconstructedResponse;
377
+ }
378
+
379
+ if (!request.method?.match(/^(get|head)$/i)) {
380
+ deconstructedResponse.status = 405;
381
+ return deconstructedResponse;
382
+ }
383
+
384
+ const notFound = () => {
385
+ let cwd = assetName;
386
+ while (cwd) {
387
+ cwd = cwd.slice(0, cwd.lastIndexOf("/"));
388
+
389
+ if ((asset = getAsset(`${cwd}/404.html`))) {
390
+ deconstructedResponse.status = 404;
391
+ deconstructedResponse.body = serveAsset(asset);
392
+ deconstructedResponse.headers.set(
393
+ "Content-Type",
394
+ getType(asset) || "application/octet-stream"
395
+ );
396
+ return deconstructedResponse;
397
+ }
398
+ }
399
+
400
+ if ((asset = getAsset(`/index.html`))) {
401
+ deconstructedResponse.body = serveAsset(asset);
402
+ deconstructedResponse.headers.set(
403
+ "Content-Type",
404
+ getType(asset) || "application/octet-stream"
405
+ );
406
+ return deconstructedResponse;
407
+ }
408
+
409
+ deconstructedResponse.status = 404;
410
+ return deconstructedResponse;
411
+ };
412
+
413
+ let asset;
414
+
415
+ if (assetName.endsWith("/")) {
416
+ if ((asset = getAsset(`${assetName}/index.html`))) {
417
+ deconstructedResponse.body = serveAsset(asset);
418
+ deconstructedResponse.headers.set(
419
+ "Content-Type",
420
+ getType(asset) || "application/octet-stream"
421
+ );
422
+ return deconstructedResponse;
423
+ } else if ((asset = getAsset(`${assetName.replace(/\/$/, ".html")}`))) {
424
+ deconstructedResponse.status = 301;
425
+ deconstructedResponse.headers.set(
426
+ "Location",
427
+ `${assetName.slice(0, -1)}${url.search}`
428
+ );
429
+ return deconstructedResponse;
430
+ }
431
+ }
432
+
433
+ if (assetName.endsWith("/index")) {
434
+ deconstructedResponse.status = 301;
435
+ deconstructedResponse.headers.set(
436
+ "Location",
437
+ `${assetName.slice(0, -"index".length)}${url.search}`
438
+ );
439
+ return deconstructedResponse;
440
+ }
441
+
442
+ if ((asset = getAsset(assetName))) {
443
+ if (assetName.endsWith(".html")) {
444
+ const extensionlessPath = assetName.slice(0, -".html".length);
445
+ if (getAsset(extensionlessPath) || extensionlessPath === "/") {
446
+ deconstructedResponse.body = serveAsset(asset);
447
+ deconstructedResponse.headers.set(
448
+ "Content-Type",
449
+ getType(asset) || "application/octet-stream"
450
+ );
451
+ return deconstructedResponse;
452
+ } else {
453
+ deconstructedResponse.status = 301;
454
+ deconstructedResponse.headers.set(
455
+ "Location",
456
+ `${extensionlessPath}${url.search}`
457
+ );
458
+ return deconstructedResponse;
459
+ }
460
+ } else {
461
+ deconstructedResponse.body = serveAsset(asset);
462
+ deconstructedResponse.headers.set(
463
+ "Content-Type",
464
+ getType(asset) || "application/octet-stream"
465
+ );
466
+ return deconstructedResponse;
467
+ }
468
+ } else if (hasFileExtension(assetName)) {
469
+ if ((asset = getAsset(assetName + ".html"))) {
470
+ deconstructedResponse.body = serveAsset(asset);
471
+ deconstructedResponse.headers.set(
472
+ "Content-Type",
473
+ getType(asset) || "application/octet-stream"
474
+ );
475
+ return deconstructedResponse;
476
+ }
477
+ notFound();
478
+ return deconstructedResponse;
479
+ }
480
+
481
+ if ((asset = getAsset(`${assetName}.html`))) {
482
+ deconstructedResponse.body = serveAsset(asset);
483
+ deconstructedResponse.headers.set(
484
+ "Content-Type",
485
+ getType(asset) || "application/octet-stream"
486
+ );
487
+ return deconstructedResponse;
488
+ }
489
+
490
+ if ((asset = getAsset(`${assetName}/index.html`))) {
491
+ deconstructedResponse.status = 301;
492
+ deconstructedResponse.headers.set(
493
+ "Location",
494
+ `${assetName}/${url.search}`
495
+ );
496
+ return deconstructedResponse;
497
+ } else {
498
+ notFound();
499
+ return deconstructedResponse;
500
+ }
501
+ };
502
+
503
+ const attachHeaders = (
504
+ request: MiniflareRequest,
505
+ deconstructedResponse: {
506
+ status: number;
507
+ headers: MiniflareHeaders;
508
+ body?: Buffer;
509
+ }
510
+ ) => {
511
+ const headers = deconstructedResponse.headers;
512
+ const newHeaders = new Headers({});
513
+ const matches = headersMatcher(request) || [];
514
+
515
+ matches.forEach((match) => {
516
+ Object.entries(match).forEach(([name, value]) => {
517
+ newHeaders.append(name, `${value}`);
518
+ });
519
+ });
520
+
521
+ const combinedHeaders = {
522
+ ...Object.fromEntries(headers.entries()),
523
+ ...Object.fromEntries(newHeaders.entries()),
524
+ };
525
+
526
+ deconstructedResponse.headers = new Headers({});
527
+ Object.entries(combinedHeaders).forEach(([name, value]) => {
528
+ if (value) deconstructedResponse.headers.set(name, value);
529
+ });
530
+ };
531
+
532
+ return async (input: RequestInfo, init?: RequestInit) => {
533
+ const request = new Request(input, init);
534
+ const deconstructedResponse = generateResponse(request);
535
+ attachHeaders(request, deconstructedResponse);
536
+
537
+ const headers = new Headers();
538
+
539
+ [...deconstructedResponse.headers.entries()].forEach(([name, value]) => {
540
+ if (value) headers.set(name, value);
541
+ });
542
+
543
+ return new Response(deconstructedResponse.body, {
544
+ headers,
545
+ status: deconstructedResponse.status,
546
+ });
547
+ };
548
+ }
549
+
550
+ const invalidAssetsFetch: typeof miniflareFetch = () => {
551
+ throw new Error(
552
+ "Trying to fetch assets directly when there is no `directory` option specified."
553
+ );
554
+ };
@@ -1,17 +1,17 @@
1
1
  export type EnumKeys<Enum> = Exclude<keyof Enum, number>;
2
2
 
3
3
  export const enumObject = <Enum extends Record<string, number | string>>(
4
- e: Enum
4
+ e: Enum
5
5
  ) => {
6
- const copy = { ...e } as { [K in EnumKeys<Enum>]: Enum[K] };
7
- Object.values(e).forEach(
8
- (value) => typeof value === "number" && delete copy[value]
9
- );
10
- return copy;
6
+ const copy = { ...e } as { [K in EnumKeys<Enum>]: Enum[K] };
7
+ Object.values(e).forEach(
8
+ (value) => typeof value === "number" && delete copy[value]
9
+ );
10
+ return copy;
11
11
  };
12
12
 
13
13
  export const enumKeys = <Enum extends Record<string, number | string>>(
14
- e: Enum
14
+ e: Enum
15
15
  ) => {
16
- return Object.keys(enumObject(e)) as EnumKeys<Enum>[];
16
+ return Object.keys(enumObject(e)) as EnumKeys<Enum>[];
17
17
  };