wrangler 0.0.0-e14e589 → 0.0.0-e2a26a0

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