wrangler 0.0.0-e1c615f → 0.0.0-e3cab74

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 (85) hide show
  1. package/bin/wrangler.js +2 -2
  2. package/package.json +28 -13
  3. package/pages/functions/buildWorker.ts +6 -1
  4. package/pages/functions/filepath-routing.test.ts +112 -28
  5. package/pages/functions/filepath-routing.ts +88 -131
  6. package/pages/functions/routes.ts +11 -18
  7. package/pages/functions/template-worker.ts +21 -28
  8. package/src/__tests__/configuration.test.ts +2185 -0
  9. package/src/__tests__/dev.test.tsx +56 -9
  10. package/src/__tests__/guess-worker-format.test.ts +66 -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 +30 -0
  15. package/src/__tests__/helpers/mock-bin.ts +36 -0
  16. package/src/__tests__/{mock-cfetch.ts → helpers/mock-cfetch.ts} +53 -17
  17. package/src/__tests__/helpers/mock-console.ts +62 -0
  18. package/src/__tests__/{mock-dialogs.ts → helpers/mock-dialogs.ts} +1 -1
  19. package/src/__tests__/helpers/mock-kv.ts +40 -0
  20. package/src/__tests__/helpers/mock-user.ts +27 -0
  21. package/src/__tests__/helpers/mock-web-socket.ts +29 -0
  22. package/src/__tests__/helpers/run-in-tmp.ts +29 -0
  23. package/src/__tests__/helpers/run-wrangler.ts +16 -0
  24. package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
  25. package/src/__tests__/index.test.ts +655 -76
  26. package/src/__tests__/jest.setup.ts +37 -2
  27. package/src/__tests__/kv.test.ts +441 -398
  28. package/src/__tests__/logout.test.ts +50 -0
  29. package/src/__tests__/package-manager.test.ts +206 -0
  30. package/src/__tests__/parse.test.ts +322 -0
  31. package/src/__tests__/publish.test.ts +2406 -0
  32. package/src/__tests__/r2.test.ts +198 -0
  33. package/src/__tests__/secret.test.ts +326 -0
  34. package/src/__tests__/sentry.test.ts +146 -0
  35. package/src/__tests__/tail.test.ts +564 -0
  36. package/src/__tests__/whoami.test.tsx +86 -0
  37. package/src/api/form_data.ts +112 -26
  38. package/src/api/preview.ts +34 -15
  39. package/src/api/worker.ts +58 -27
  40. package/src/bundle.ts +133 -0
  41. package/src/cfetch/index.ts +21 -19
  42. package/src/cfetch/internal.ts +85 -21
  43. package/src/cli.ts +10 -0
  44. package/src/config/README.md +107 -0
  45. package/src/config/config.ts +265 -0
  46. package/src/config/diagnostics.ts +80 -0
  47. package/src/config/environment.ts +305 -0
  48. package/src/config/index.ts +52 -0
  49. package/src/config/validation-helpers.ts +370 -0
  50. package/src/config/validation.ts +1017 -0
  51. package/src/dev.tsx +455 -368
  52. package/src/dialogs.tsx +2 -2
  53. package/src/entry.ts +57 -0
  54. package/src/environment-variables.ts +33 -0
  55. package/src/guess-worker-format.ts +68 -0
  56. package/src/index.tsx +1044 -646
  57. package/src/inspect.ts +609 -0
  58. package/src/kv.tsx +47 -39
  59. package/src/module-collection.ts +142 -36
  60. package/src/open-in-browser.ts +13 -0
  61. package/src/package-manager.ts +126 -0
  62. package/src/pages.tsx +139 -62
  63. package/src/parse.ts +183 -0
  64. package/src/paths.ts +26 -0
  65. package/src/proxy.ts +350 -77
  66. package/src/publish.ts +307 -289
  67. package/src/r2.ts +50 -0
  68. package/src/reporting.ts +115 -0
  69. package/src/sites.tsx +183 -56
  70. package/src/tail/filters.ts +279 -0
  71. package/src/tail/index.ts +299 -0
  72. package/src/tail/printing.ts +62 -0
  73. package/src/user.tsx +137 -110
  74. package/src/whoami.tsx +69 -0
  75. package/templates/new-worker.js +15 -0
  76. package/templates/new-worker.ts +15 -0
  77. package/{static-asset-facade.js → templates/static-asset-facade.js} +0 -0
  78. package/templates/tsconfig.json +105 -0
  79. package/wrangler-dist/cli.js +127861 -111486
  80. package/wrangler-dist/cli.js.map +3 -3
  81. package/src/__tests__/run-in-tmp.ts +0 -19
  82. package/src/__tests__/run-wrangler.ts +0 -32
  83. package/src/api/inspect.ts +0 -430
  84. package/src/config.ts +0 -131
  85. package/src/tail.tsx +0 -73
package/src/proxy.ts CHANGED
@@ -1,97 +1,283 @@
1
- import { connect } from "node:http2";
2
1
  import { createServer } from "node:http";
3
- import type { Server, IncomingHttpHeaders, RequestListener } from "node:http";
2
+ import { connect } from "node:http2";
4
3
  import WebSocket from "faye-websocket";
4
+ import { useEffect, useRef, useState } from "react";
5
5
  import serveStatic from "serve-static";
6
+ import type { CfPreviewToken } from "./api/preview";
7
+ import type {
8
+ IncomingHttpHeaders,
9
+ RequestListener,
10
+ IncomingMessage,
11
+ ServerResponse,
12
+ Server,
13
+ } from "node:http";
14
+ import type { ClientHttp2Session, ServerHttp2Stream } from "node:http2";
15
+ import type ws from "ws";
6
16
 
7
- export interface HttpProxyInit {
8
- host: string;
9
- assetPath?: string | null;
10
- onRequest?: (headers: IncomingHttpHeaders) => void;
11
- onResponse?: (headers: IncomingHttpHeaders) => void;
17
+ interface IWebsocket extends ws {
18
+ // Pipe implements .on("message", ...)
19
+ pipe<T>(fn: T): IWebsocket;
12
20
  }
13
21
 
14
22
  /**
15
- * Creates a HTTP/1 proxy that sends requests over HTTP/2.
23
+ * `usePreviewServer` is a React hook that creates a local development
24
+ * server that can be used to develop a Worker.
25
+ *
26
+ * When we run `wrangler dev`, we start by uploading the compiled worker
27
+ * to the preview service, which responds with a preview token.
28
+ * (see `useWorker`/`createWorker` for details.)
29
+ * We can then use that token to connect to the preview server for a
30
+ * great local development experience. Further, as we change the worker,
31
+ * we can update the preview token transparently without having to restart
32
+ * the development server.
16
33
  */
17
- export function createHttpProxy(init: HttpProxyInit): Server {
18
- const { host, assetPath, onRequest = () => {}, onResponse = () => {} } = init;
19
- const remote = connect(`https://${host}`);
20
- const local = createServer();
21
- // HTTP/2 -> HTTP/2
22
- local.on("stream", (stream, headers: IncomingHttpHeaders) => {
23
- onRequest(headers);
24
- headers[":authority"] = host;
25
- const request = stream.pipe(remote.request(headers));
26
- request.on("response", (responseHeaders: IncomingHttpHeaders) => {
27
- onResponse(responseHeaders);
28
- stream.respond(responseHeaders);
29
- request.pipe(stream, { end: true });
30
- });
31
- });
32
- // HTTP/1 -> HTTP/2
33
- const handleRequest: RequestListener = (message, response) => {
34
- const { httpVersionMajor, headers, method, url } = message;
35
- if (httpVersionMajor >= 2) {
36
- return; // Already handled by the "stream" event.
34
+
35
+ /** Rewrite request headers to add the preview token. */
36
+ function addCfPreviewTokenHeader(
37
+ headers: IncomingHttpHeaders,
38
+ previewTokenValue: string
39
+ ) {
40
+ headers["cf-workers-preview-token"] = previewTokenValue;
41
+ }
42
+
43
+ /**
44
+ * Rewrite references in request headers
45
+ * from the preview host to the local host.
46
+ */
47
+ function rewriteRemoteHostToLocalHostInHeaders(
48
+ headers: IncomingHttpHeaders,
49
+ remoteHost: string,
50
+ localPort: number
51
+ ) {
52
+ for (const [name, value] of Object.entries(headers)) {
53
+ // Rewrite the remote host to the local host.
54
+ if (typeof value === "string" && value.includes(remoteHost)) {
55
+ headers[name] = value
56
+ .replaceAll(`https://${remoteHost}`, `http://localhost:${localPort}`)
57
+ .replaceAll(remoteHost, `localhost:${localPort}`);
37
58
  }
38
- onRequest(headers);
39
- headers[":method"] = method;
40
- headers[":path"] = url;
41
- headers[":authority"] = host;
42
- headers[":scheme"] = "https";
43
- for (const name of Object.keys(headers)) {
44
- if (HTTP1_HEADERS.has(name.toLowerCase())) {
45
- delete headers[name];
46
- }
59
+ }
60
+ }
61
+
62
+ export function usePreviewServer({
63
+ previewToken,
64
+ publicRoot,
65
+ port,
66
+ }: {
67
+ previewToken: CfPreviewToken | undefined;
68
+ publicRoot: undefined | string;
69
+ port: number;
70
+ }) {
71
+ /** Creates an HTTP/1 proxy that sends requests over HTTP/2. */
72
+ const proxyServer = useRef<Server>();
73
+ const proxy = (proxyServer.current ??= createProxyServer());
74
+
75
+ /**
76
+ * When we're not connected / getting a fresh token on changes,
77
+ * we'd like to buffer streams/requests until we're connected.
78
+ * Once connected, we can flush the buffered streams/requests.
79
+ * streamBufferRef is used to buffer http/2 streams, while
80
+ * requestResponseBufferRef is used to buffer http/1 requests.
81
+ */
82
+ const streamBufferRef = useRef<
83
+ { stream: ServerHttp2Stream; headers: IncomingHttpHeaders }[]
84
+ >([]);
85
+ const requestResponseBufferRef = useRef<
86
+ { request: IncomingMessage; response: ServerResponse }[]
87
+ >([]);
88
+
89
+ /**
90
+ * The session doesn't last forever, and will eventually drop
91
+ * (usually within 5-15 minutes). When that happens, we simply
92
+ * restart the effect, effectively restarting the server. We use
93
+ * a state sigil as an effect dependency to do so.
94
+ */
95
+ const [retryServerSetupSigil, setRetryServerSetupSigil] = useState<number>(0);
96
+ function retryServerSetup() {
97
+ setRetryServerSetupSigil((x) => x + 1);
98
+ }
99
+
100
+ useEffect(() => {
101
+ // If we don't have a token, that means either we're just starting up,
102
+ // or we're refreshing the token.
103
+ if (!previewToken) {
104
+ const cleanupListeners: (() => void)[] = [];
105
+ const bufferStream = (
106
+ stream: ServerHttp2Stream,
107
+ headers: IncomingHttpHeaders
108
+ ) => {
109
+ // store the stream in a buffer so we can replay it later
110
+ streamBufferRef.current.push({ stream, headers });
111
+ };
112
+ proxy.on("stream", bufferStream);
113
+ cleanupListeners.push(() => proxy.off("stream", bufferStream));
114
+
115
+ const bufferRequestResponse = (
116
+ request: IncomingMessage,
117
+ response: ServerResponse
118
+ ) => {
119
+ // store the request and response in a buffer so we can replay it later
120
+ requestResponseBufferRef.current.push({ request, response });
121
+ };
122
+
123
+ proxy.on("request", bufferRequestResponse);
124
+ cleanupListeners.push(() => proxy.off("request", bufferRequestResponse));
125
+ return () => {
126
+ cleanupListeners.forEach((cleanup) => cleanup());
127
+ };
47
128
  }
48
- const request = message.pipe(remote.request(headers));
49
- request.on("response", (responseHeaders) => {
50
- const status = responseHeaders[":status"];
51
- onResponse(responseHeaders);
52
- for (const name of Object.keys(responseHeaders)) {
53
- if (name.startsWith(":")) {
54
- delete responseHeaders[name];
129
+
130
+ // We have a token. Let's proxy requests to the preview end point.
131
+ const cleanupListeners: (() => void)[] = [];
132
+
133
+ const assetPath = typeof publicRoot === "string" ? publicRoot : null;
134
+
135
+ // create a ClientHttp2Session
136
+ const remote = connect(`https://${previewToken.host}`);
137
+ cleanupListeners.push(() => remote.destroy());
138
+
139
+ // As mentioned above, the session may die at any point,
140
+ // so we need to restart the effect.
141
+ remote.on("close", retryServerSetup);
142
+ cleanupListeners.push(() => remote.off("close", retryServerSetup));
143
+
144
+ /** HTTP/2 -> HTTP/2 */
145
+ const handleStream = createStreamHandler(previewToken, remote, port);
146
+ proxy.on("stream", handleStream);
147
+ cleanupListeners.push(() => proxy.off("stream", handleStream));
148
+
149
+ // flush and replay buffered streams
150
+ streamBufferRef.current.forEach((buffer) =>
151
+ handleStream(buffer.stream, buffer.headers)
152
+ );
153
+ streamBufferRef.current = [];
154
+
155
+ /** HTTP/1 -> HTTP/2 */
156
+ const handleRequest: RequestListener = (
157
+ message: IncomingMessage,
158
+ response: ServerResponse
159
+ ) => {
160
+ const { httpVersionMajor, headers, method, url } = message;
161
+ if (httpVersionMajor >= 2) {
162
+ return; // Already handled by the "stream" event.
163
+ }
164
+ addCfPreviewTokenHeader(headers, previewToken.value);
165
+ headers[":method"] = method;
166
+ headers[":path"] = url;
167
+ headers[":authority"] = previewToken.host;
168
+ headers[":scheme"] = "https";
169
+ for (const name of Object.keys(headers)) {
170
+ if (HTTP1_HEADERS.has(name.toLowerCase())) {
171
+ delete headers[name];
55
172
  }
56
173
  }
57
- response.writeHead(status, responseHeaders);
58
- request.pipe(response, { end: true });
59
- });
60
- };
61
- // If an asset path is defined, check the file system
62
- // for a file first and serve if it exists.
63
- if (assetPath) {
64
- const handleAsset = serveStatic(assetPath, {
65
- cacheControl: false,
66
- });
67
- local.on("request", (request, response) => {
68
- handleAsset(request, response, () => {
69
- handleRequest(request, response);
174
+ const request = message.pipe(remote.request(headers));
175
+ request.on("response", (responseHeaders) => {
176
+ const status = responseHeaders[":status"] ?? 500;
177
+ rewriteRemoteHostToLocalHostInHeaders(
178
+ responseHeaders,
179
+ previewToken.host,
180
+ port
181
+ );
182
+ for (const name of Object.keys(responseHeaders)) {
183
+ if (name.startsWith(":")) {
184
+ delete responseHeaders[name];
185
+ }
186
+ }
187
+ response.writeHead(status, responseHeaders);
188
+ request.pipe(response, { end: true });
70
189
  });
71
- });
72
- } else {
73
- local.on("request", handleRequest);
74
- }
75
- // HTTP/1 -> WebSocket (over HTTP/1)
76
- local.on("upgrade", (message, socket, body) => {
77
- const { headers, url } = message;
78
- onRequest(headers);
79
- headers["host"] = host;
80
- const localWebsocket = new WebSocket(message, socket, body);
81
- // TODO(soon): Custom WebSocket protocol is not working?
82
- const remoteWebsocketClient = new WebSocket.Client(
83
- `wss://${host}${url}`,
84
- [],
85
- { headers }
190
+ };
191
+
192
+ // If an asset path is defined, check the file system
193
+ // for a file first and serve if it exists.
194
+ const actualHandleRequest = assetPath
195
+ ? createHandleAssetsRequest(assetPath, handleRequest)
196
+ : handleRequest;
197
+
198
+ proxy.on("request", actualHandleRequest);
199
+ cleanupListeners.push(() => proxy.off("request", actualHandleRequest));
200
+
201
+ // flush and replay buffered requests
202
+ requestResponseBufferRef.current.forEach(({ request, response }) =>
203
+ actualHandleRequest(request, response)
86
204
  );
87
- localWebsocket.pipe(remoteWebsocketClient).pipe(localWebsocket);
88
- });
89
- remote.on("close", () => {
90
- local.close();
205
+ requestResponseBufferRef.current = [];
206
+
207
+ /** HTTP/1 -> WebSocket (over HTTP/1) */
208
+ const handleUpgrade = (
209
+ message: IncomingMessage,
210
+ socket: WebSocket,
211
+ body: Buffer
212
+ ) => {
213
+ const { headers, url } = message;
214
+ addCfPreviewTokenHeader(headers, previewToken.value);
215
+ headers["host"] = previewToken.host;
216
+ const localWebsocket = new WebSocket(message, socket, body) as IWebsocket;
217
+ // TODO(soon): Custom WebSocket protocol is not working?
218
+ const remoteWebsocketClient = new WebSocket.Client(
219
+ `wss://${previewToken.host}${url}`,
220
+ [],
221
+ { headers }
222
+ ) as IWebsocket;
223
+ localWebsocket.pipe(remoteWebsocketClient).pipe(localWebsocket);
224
+ // We close down websockets whenever we refresh the token.
225
+ cleanupListeners.push(() => {
226
+ localWebsocket.close();
227
+ remoteWebsocketClient.close();
228
+ });
229
+ };
230
+ proxy.on("upgrade", handleUpgrade);
231
+ cleanupListeners.push(() => proxy.off("upgrade", handleUpgrade));
232
+
233
+ return () => {
234
+ cleanupListeners.forEach((cleanup) => cleanup());
235
+ };
236
+ }, [
237
+ previewToken,
238
+ publicRoot,
239
+ port,
240
+ proxy,
241
+ // We use a state value as a sigil to trigger reconnecting the server.
242
+ // It's not used inside the effect, so react-hooks/exhaustive-deps
243
+ // doesn't complain if it's not included in the dependency array.
244
+ // But its presence is critical, so Do NOT remove it from the dependency list.
245
+ retryServerSetupSigil,
246
+ ]);
247
+
248
+ // Start/stop the server whenever the
249
+ // containing component is mounted/unmounted.
250
+ useEffect(() => {
251
+ waitForPortToBeAvailable(port, { retryPeriod: 200, timeout: 2000 })
252
+ .then(() => {
253
+ proxy.listen(port);
254
+ console.log(`⬣ Listening at http://localhost:${port}`);
255
+ })
256
+ .catch((err) => {
257
+ console.error(`⬣ Failed to start server: ${err}`);
258
+ });
259
+
260
+ return () => {
261
+ proxy.close();
262
+ };
263
+ }, [port, proxy]);
264
+ }
265
+
266
+ function createHandleAssetsRequest(
267
+ assetPath: string,
268
+ handleRequest: RequestListener
269
+ ) {
270
+ const handleAsset = serveStatic(assetPath, {
271
+ cacheControl: false,
91
272
  });
92
- return local;
273
+ return (request: IncomingMessage, response: ServerResponse) => {
274
+ handleAsset(request, response, () => {
275
+ handleRequest(request, response);
276
+ });
277
+ };
93
278
  }
94
279
 
280
+ /** A Set of headers we want to remove from HTTP/1 requests. */
95
281
  const HTTP1_HEADERS = new Set([
96
282
  "host",
97
283
  "connection",
@@ -101,3 +287,90 @@ const HTTP1_HEADERS = new Set([
101
287
  "transfer-encoding",
102
288
  "http2-settings",
103
289
  ]);
290
+
291
+ function createProxyServer() {
292
+ return createServer()
293
+ .on("request", function (req, res) {
294
+ // log all requests
295
+ console.log(
296
+ new Date().toLocaleTimeString(),
297
+ req.method,
298
+ req.url,
299
+ res.statusCode
300
+ );
301
+ })
302
+ .on("upgrade", (req) => {
303
+ // log all websocket connections
304
+ console.log(
305
+ new Date().toLocaleTimeString(),
306
+ req.method,
307
+ req.url,
308
+ 101,
309
+ "(WebSocket)"
310
+ );
311
+ })
312
+ .on("error", (err) => {
313
+ // log all connection errors
314
+ console.error(new Date().toLocaleTimeString(), err);
315
+ });
316
+ }
317
+
318
+ function createStreamHandler(
319
+ previewToken: CfPreviewToken,
320
+ remote: ClientHttp2Session,
321
+ port: number
322
+ ) {
323
+ return function handleStream(
324
+ stream: ServerHttp2Stream,
325
+ headers: IncomingHttpHeaders
326
+ ) {
327
+ addCfPreviewTokenHeader(headers, previewToken.value);
328
+ headers[":authority"] = previewToken.host;
329
+ const request = stream.pipe(remote.request(headers));
330
+ request.on("response", (responseHeaders: IncomingHttpHeaders) => {
331
+ rewriteRemoteHostToLocalHostInHeaders(
332
+ responseHeaders,
333
+ previewToken.host,
334
+ port
335
+ );
336
+ stream.respond(responseHeaders);
337
+ request.pipe(stream, { end: true });
338
+ });
339
+ };
340
+ }
341
+
342
+ /**
343
+ * A helper function that waits for a port to be available.
344
+ */
345
+ export async function waitForPortToBeAvailable(
346
+ port: number,
347
+ options: { retryPeriod: number; timeout: number }
348
+ ): Promise<void> {
349
+ return new Promise((resolve, reject) => {
350
+ const timeout = setTimeout(() => {
351
+ reject(new Error(`Timed out waiting for port ${port}`));
352
+ }, options.timeout);
353
+
354
+ function checkPort() {
355
+ // Testing whether a port is 'available' involves simply
356
+ // trying to make a server listen on that port, and retrying
357
+ // until it succeeds.
358
+ const server = createServer();
359
+ server.on("error", (err) => {
360
+ // @ts-expect-error non standard property on Error
361
+ if (err.code === "EADDRINUSE") {
362
+ setTimeout(checkPort, options.retryPeriod);
363
+ } else {
364
+ reject(err);
365
+ }
366
+ });
367
+ server.listen(port, () => {
368
+ server.close();
369
+ clearTimeout(timeout);
370
+ resolve();
371
+ });
372
+ }
373
+
374
+ checkPort();
375
+ });
376
+ }