wrangler 0.0.0-e6733a3 → 0.0.0-e6ada079

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.

Potentially problematic release.


This version of wrangler might be problematic. Click here for more details.

Files changed (119) hide show
  1. package/README.md +47 -16
  2. package/bin/wrangler.js +94 -31
  3. package/config-schema.json +3100 -0
  4. package/kv-asset-handler.js +1 -0
  5. package/package.json +154 -82
  6. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  7. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  8. package/templates/__tests__/tsconfig.json +8 -0
  9. package/templates/checked-fetch.js +30 -0
  10. package/templates/facade.d.ts +19 -0
  11. package/templates/gitignore +170 -0
  12. package/templates/init-tests/test-jest-new-worker.js +23 -0
  13. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  14. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  15. package/templates/middleware/common.ts +67 -0
  16. package/templates/middleware/loader-modules.ts +134 -0
  17. package/templates/middleware/loader-sw.ts +229 -0
  18. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  19. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  20. package/templates/middleware/middleware-pretty-error.ts +40 -0
  21. package/templates/middleware/middleware-scheduled.ts +15 -0
  22. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  23. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  24. package/templates/modules-watch-stub.js +4 -0
  25. package/templates/new-worker-scheduled.js +17 -0
  26. package/templates/new-worker-scheduled.ts +32 -0
  27. package/templates/new-worker.js +15 -0
  28. package/templates/new-worker.ts +33 -0
  29. package/templates/no-op-worker.js +10 -0
  30. package/templates/pages-dev-pipeline.ts +32 -0
  31. package/templates/pages-dev-util.ts +55 -0
  32. package/templates/pages-shim.ts +9 -0
  33. package/templates/pages-template-plugin.ts +190 -0
  34. package/templates/pages-template-worker.ts +198 -0
  35. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  36. package/templates/startDevWorker/ProxyWorker.ts +334 -0
  37. package/templates/tsconfig-sanity.ts +11 -0
  38. package/templates/tsconfig.init.json +22 -0
  39. package/templates/tsconfig.json +8 -0
  40. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  41. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  42. package/wrangler-dist/ProxyWorker.js +240 -0
  43. package/wrangler-dist/ProxyWorker.js.map +6 -0
  44. package/wrangler-dist/cli.d.ts +26391 -0
  45. package/wrangler-dist/cli.js +204293 -116652
  46. package/wrangler-dist/wasm-sync.wasm +0 -0
  47. package/import_meta_url.js +0 -3
  48. package/miniflare-config-stubs/.env.empty +0 -0
  49. package/miniflare-config-stubs/package.empty.json +0 -1
  50. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  51. package/pages/functions/buildWorker.ts +0 -62
  52. package/pages/functions/filepath-routing.test.ts +0 -39
  53. package/pages/functions/filepath-routing.ts +0 -221
  54. package/pages/functions/identifiers.ts +0 -78
  55. package/pages/functions/routes.ts +0 -158
  56. package/pages/functions/template-worker.ts +0 -144
  57. package/src/__tests__/clipboardy-mock.js +0 -4
  58. package/src/__tests__/dev.test.tsx +0 -66
  59. package/src/__tests__/index.test.ts +0 -287
  60. package/src/__tests__/jest.setup.ts +0 -22
  61. package/src/__tests__/kv.test.ts +0 -1098
  62. package/src/__tests__/mock-cfetch.ts +0 -171
  63. package/src/__tests__/mock-dialogs.ts +0 -65
  64. package/src/__tests__/run-in-tmp.ts +0 -19
  65. package/src/__tests__/run-wrangler.ts +0 -32
  66. package/src/api/form_data.ts +0 -131
  67. package/src/api/preview.ts +0 -128
  68. package/src/api/worker.ts +0 -155
  69. package/src/cfetch/index.ts +0 -102
  70. package/src/cfetch/internal.ts +0 -69
  71. package/src/cli.ts +0 -9
  72. package/src/config.ts +0 -487
  73. package/src/dev.tsx +0 -771
  74. package/src/dialogs.tsx +0 -77
  75. package/src/index.tsx +0 -1974
  76. package/src/inspect.ts +0 -524
  77. package/src/kv.tsx +0 -267
  78. package/src/module-collection.ts +0 -64
  79. package/src/pages.tsx +0 -1031
  80. package/src/proxy.ts +0 -294
  81. package/src/publish.ts +0 -358
  82. package/src/sites.tsx +0 -114
  83. package/src/tail.tsx +0 -73
  84. package/src/user.tsx +0 -1025
  85. package/static-asset-facade.js +0 -47
  86. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  87. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  88. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  89. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  90. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  91. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  92. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  93. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  94. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  95. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  96. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  97. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  98. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  99. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  100. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  101. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  102. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  103. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  104. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  105. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  106. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  107. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  108. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  109. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  110. package/vendor/wrangler-mime/LICENSE +0 -21
  111. package/vendor/wrangler-mime/Mime.js +0 -97
  112. package/vendor/wrangler-mime/README.md +0 -187
  113. package/vendor/wrangler-mime/cli.js +0 -46
  114. package/vendor/wrangler-mime/index.js +0 -4
  115. package/vendor/wrangler-mime/lite.js +0 -4
  116. package/vendor/wrangler-mime/package.json +0 -52
  117. package/vendor/wrangler-mime/types/other.js +0 -1
  118. package/vendor/wrangler-mime/types/standard.js +0 -1
  119. package/wrangler-dist/cli.js.map +0 -7
@@ -0,0 +1,334 @@
1
+ import {
2
+ createDeferred,
3
+ DeferredPromise,
4
+ urlFromParts,
5
+ } from "../../src/api/startDevWorker/utils";
6
+ import type {
7
+ ProxyData,
8
+ ProxyWorkerIncomingRequestBody,
9
+ ProxyWorkerOutgoingRequestBody,
10
+ } from "../../src/api/startDevWorker/events";
11
+
12
+ interface Env {
13
+ PROXY_CONTROLLER: Fetcher;
14
+ PROXY_CONTROLLER_AUTH_SECRET: string;
15
+ DURABLE_OBJECT: DurableObjectNamespace;
16
+ }
17
+
18
+ // request.cf.hostMetadata is verbose to type using the workers-types Request -- this allows us to have Request correctly typed in this scope
19
+ type Request = Parameters<
20
+ NonNullable<
21
+ ExportedHandler<Env, unknown, ProxyWorkerIncomingRequestBody>["fetch"]
22
+ >
23
+ >[0];
24
+
25
+ const LIVE_RELOAD_PROTOCOL = "WRANGLER_PROXYWORKER_LIVE_RELOAD_PROTOCOL";
26
+ export default {
27
+ fetch(req, env) {
28
+ const singleton = env.DURABLE_OBJECT.idFromName("");
29
+ const inspectorProxy = env.DURABLE_OBJECT.get(singleton);
30
+
31
+ return inspectorProxy.fetch(req);
32
+ },
33
+ } as ExportedHandler<Env, unknown, ProxyWorkerIncomingRequestBody>;
34
+
35
+ export class ProxyWorker implements DurableObject {
36
+ constructor(
37
+ readonly state: DurableObjectState,
38
+ readonly env: Env
39
+ ) {}
40
+
41
+ proxyData?: ProxyData;
42
+ requestQueue = new Map<Request, DeferredPromise<Response>>();
43
+ requestRetryQueue = new Map<Request, DeferredPromise<Response>>();
44
+
45
+ fetch(request: Request) {
46
+ if (isRequestForLiveReloadWebsocket(request)) {
47
+ // requests for live-reload websocket
48
+
49
+ return this.handleLiveReloadWebSocket(request);
50
+ }
51
+
52
+ if (isRequestFromProxyController(request, this.env)) {
53
+ // requests from ProxyController
54
+
55
+ return this.processProxyControllerRequest(request);
56
+ }
57
+
58
+ // regular requests to be proxied
59
+ const deferred = createDeferred<Response>();
60
+
61
+ this.requestQueue.set(request, deferred);
62
+ this.processQueue();
63
+
64
+ return deferred.promise;
65
+ }
66
+
67
+ handleLiveReloadWebSocket(request: Request) {
68
+ const { 0: response, 1: liveReload } = new WebSocketPair();
69
+ const websocketProtocol =
70
+ request.headers.get("Sec-WebSocket-Protocol") ?? "";
71
+
72
+ this.state.acceptWebSocket(liveReload, ["live-reload"]);
73
+
74
+ return new Response(null, {
75
+ status: 101,
76
+ webSocket: response,
77
+ headers: { "Sec-WebSocket-Protocol": websocketProtocol },
78
+ });
79
+ }
80
+
81
+ processProxyControllerRequest(request: Request) {
82
+ const event = request.cf?.hostMetadata;
83
+ switch (event?.type) {
84
+ case "pause":
85
+ this.proxyData = undefined;
86
+ break;
87
+
88
+ case "play":
89
+ this.proxyData = event.proxyData;
90
+ this.processQueue();
91
+ this.state
92
+ .getWebSockets("live-reload")
93
+ .forEach((ws) => ws.send("reload"));
94
+
95
+ break;
96
+ }
97
+
98
+ return new Response(null, { status: 204 });
99
+ }
100
+
101
+ /**
102
+ * Process requests that are being retried first, then process newer requests.
103
+ * Requests that are being retried are, by definition, older than requests which haven't been processed yet.
104
+ * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.
105
+ */
106
+ *getOrderedQueue() {
107
+ yield* this.requestRetryQueue;
108
+ yield* this.requestQueue;
109
+ }
110
+
111
+ processQueue() {
112
+ const { proxyData } = this; // store proxyData at the moment this function was called
113
+ if (proxyData === undefined) return;
114
+
115
+ for (const [request, deferredResponse] of this.getOrderedQueue()) {
116
+ this.requestRetryQueue.delete(request);
117
+ this.requestQueue.delete(request);
118
+
119
+ const outerUrl = new URL(request.url);
120
+ const headers = new Headers(request.headers);
121
+
122
+ // override url parts for proxying
123
+ const userWorkerUrl = new URL(request.url);
124
+ Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
125
+
126
+ // set request.url in the UserWorker
127
+ const innerUrl = new URL(request.url);
128
+ Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
129
+ headers.set("MF-Original-URL", innerUrl.href);
130
+ headers.set("MF-Disable-Pretty-Error", "true"); // disables the UserWorker miniflare instance from rendering the pretty error -- instead the ProxyWorker miniflare instance will intercept the json error response and render the pretty error page
131
+
132
+ // Preserve client `Accept-Encoding`, rather than using Worker's default
133
+ // of `Accept-Encoding: br, gzip`
134
+ const encoding = request.cf?.clientAcceptEncoding;
135
+ if (encoding !== undefined) headers.set("Accept-Encoding", encoding);
136
+
137
+ rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
138
+
139
+ // merge proxyData headers with the request headers
140
+ for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
141
+ if (value === undefined) continue;
142
+
143
+ if (key.toLowerCase() === "cookie") {
144
+ const existing = request.headers.get("cookie") ?? "";
145
+ headers.set("cookie", `${existing};${value}`);
146
+ } else {
147
+ headers.set(key, value);
148
+ }
149
+ }
150
+
151
+ // explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly + synchronously
152
+ void fetch(userWorkerUrl, new Request(request, { headers }))
153
+ .then((res) => {
154
+ res = new Response(res.body, res);
155
+ rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
156
+
157
+ if (isHtmlResponse(res)) {
158
+ res = insertLiveReloadScript(request, res, this.env, proxyData);
159
+ }
160
+
161
+ deferredResponse.resolve(res);
162
+ })
163
+ .catch((error: Error) => {
164
+ // errors here are network errors or from response post-processing
165
+ // to catch only network errors, use the 2nd param of the fetch.then()
166
+
167
+ // we have crossed an async boundary, so proxyData may have changed
168
+ // if proxyData.userWorkerUrl has changed, it means there is a new downstream UserWorker
169
+ // and that this error is stale since it was for a request to the old UserWorker
170
+ // so here we construct a newUserWorkerUrl so we can compare it to the (old) userWorkerUrl
171
+ const newUserWorkerUrl =
172
+ this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);
173
+
174
+ // only report errors if the downstream proxy has NOT changed
175
+ if (userWorkerUrl.href === newUserWorkerUrl?.href) {
176
+ void sendMessageToProxyController(this.env, {
177
+ type: "error",
178
+ error: {
179
+ name: error.name,
180
+ message: error.message,
181
+ stack: error.stack,
182
+ cause: error.cause,
183
+ },
184
+ });
185
+
186
+ deferredResponse.reject(error);
187
+ }
188
+
189
+ // if the request can be retried (subset of idempotent requests which have no body), requeue it
190
+ else if (request.method === "GET" || request.method === "HEAD") {
191
+ this.requestRetryQueue.set(request, deferredResponse);
192
+ // we would only end up here if the downstream UserWorker is chang*ing*
193
+ // i.e. we are in a `pause`d state and expecting a `play` message soon
194
+ // this request will be processed (retried) when the `play` message arrives
195
+ // for that reason, we do not need to call `this.processQueue` here
196
+ // (but, also, it can't hurt to call it since it bails when
197
+ // in a `pause`d state i.e. `this.proxyData` is undefined)
198
+ }
199
+
200
+ // if the request cannot be retried, respond with 503 Service Unavailable
201
+ // important to note, this is not an (unexpected) error -- it is an acceptable flow of local development
202
+ // it would be incorrect to retry non-idempotent requests
203
+ // and would require cloning all body streams to avoid stream reuse (which is inefficient but not out of the question in the future)
204
+ // this is a good enough UX for now since it solves the most common GET use-case
205
+ else {
206
+ deferredResponse.resolve(
207
+ new Response(
208
+ "Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.",
209
+ {
210
+ status: 503,
211
+ headers: { "Retry-After": "0" },
212
+ }
213
+ )
214
+ );
215
+ }
216
+ });
217
+ }
218
+ }
219
+ }
220
+
221
+ function isRequestFromProxyController(req: Request, env: Env): boolean {
222
+ return req.headers.get("Authorization") === env.PROXY_CONTROLLER_AUTH_SECRET;
223
+ }
224
+ function isHtmlResponse(res: Response): boolean {
225
+ return res.headers.get("content-type")?.startsWith("text/html") ?? false;
226
+ }
227
+ function isRequestForLiveReloadWebsocket(req: Request): boolean {
228
+ const websocketProtocol = req.headers.get("Sec-WebSocket-Protocol");
229
+ const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
230
+
231
+ return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
232
+ }
233
+
234
+ function sendMessageToProxyController(
235
+ env: Env,
236
+ message: ProxyWorkerOutgoingRequestBody
237
+ ) {
238
+ return env.PROXY_CONTROLLER.fetch("http://dummy", {
239
+ method: "POST",
240
+ body: JSON.stringify(message),
241
+ });
242
+ }
243
+
244
+ function insertLiveReloadScript(
245
+ request: Request,
246
+ response: Response,
247
+ env: Env,
248
+ proxyData: ProxyData
249
+ ) {
250
+ const htmlRewriter = new HTMLRewriter();
251
+
252
+ // if preview-token-expired response, errorDetails will contain "Invalid Workers Preview configuration"
253
+ let errorDetails = "";
254
+ htmlRewriter.on("#cf-error-details", {
255
+ text(element) {
256
+ errorDetails += element.text;
257
+ },
258
+ });
259
+
260
+ htmlRewriter.onDocument({
261
+ end(end) {
262
+ if (
263
+ response.status === 400 &&
264
+ errorDetails.includes("Invalid Workers Preview configuration")
265
+ ) {
266
+ void sendMessageToProxyController(env, {
267
+ type: "previewTokenExpired",
268
+ proxyData,
269
+ });
270
+ }
271
+
272
+ // if liveReload enabled, append a script tag
273
+ // TODO: compare to existing nodejs implementation
274
+ if (proxyData.liveReload) {
275
+ const websocketUrl = new URL(request.url);
276
+ websocketUrl.protocol =
277
+ websocketUrl.protocol === "http:" ? "ws:" : "wss:";
278
+
279
+ end.append(
280
+ `
281
+ <script>
282
+ (function() {
283
+ var ws;
284
+ function recover() {
285
+ ws = null;
286
+ setTimeout(initLiveReload, 100);
287
+ }
288
+ function initLiveReload() {
289
+ if (ws) return;
290
+ var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
291
+ ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
292
+ ws.onclose = recover;
293
+ ws.onerror = recover;
294
+ ws.onmessage = location.reload.bind(location);
295
+ }
296
+ })();
297
+ </script>
298
+ `,
299
+ { html: true }
300
+ );
301
+ }
302
+ },
303
+ });
304
+
305
+ return htmlRewriter.transform(response);
306
+ }
307
+
308
+ /**
309
+ * Rewrite references to URLs in request/response headers.
310
+ *
311
+ * This function is used to map the URLs in headers like Origin and Access-Control-Allow-Origin
312
+ * so that this proxy is transparent to the Client Browser and User Worker.
313
+ */
314
+ function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
315
+ const setCookie = headers.getAll("Set-Cookie");
316
+ headers.delete("Set-Cookie");
317
+ headers.forEach((value, key) => {
318
+ if (typeof value === "string" && value.includes(from.host)) {
319
+ headers.set(
320
+ key,
321
+ value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
322
+ );
323
+ }
324
+ });
325
+ for (const cookie of setCookie) {
326
+ headers.append(
327
+ "Set-Cookie",
328
+ cookie.replace(
329
+ new RegExp(`Domain=${from.hostname}($|;|,)`),
330
+ `Domain=${to.hostname}$1`
331
+ )
332
+ );
333
+ }
334
+ }
@@ -0,0 +1,11 @@
1
+ // @ts-nocheck `@types/node` should NOT be included
2
+ Buffer.from("test");
3
+
4
+ // @ts-expect-error `@types/jest` should NOT be included
5
+ test("test");
6
+
7
+ // `@cloudflare/workers-types` should be included
8
+ const _handler: ExportedHandler = {};
9
+ new HTMLRewriter();
10
+
11
+ export {};
@@ -0,0 +1,22 @@
1
+ {
2
+ "compilerOptions": {
3
+ "target": "es2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
4
+ "lib": [
5
+ "es2021"
6
+ ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
7
+ "jsx": "react-jsx" /* Specify what JSX code is generated. */,
8
+ "module": "ESNext" /* Specify what module code is generated. */,
9
+ "moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
10
+ "types": [
11
+ "@cloudflare/workers-types"
12
+ ] /* Specify type package names to be included without being referenced in a source file. */,
13
+ "resolveJsonModule": true /* Enable importing .json files */,
14
+ "allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
15
+ "noEmit": true /* Disable emitting files from a compilation. */,
16
+ "isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
17
+ "allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
18
+ "strict": true /* Enable all strict type-checking options. */,
19
+ "noUncheckedIndexedAccess": true,
20
+ "skipLibCheck": true /* Skip type checking all .d.ts files. */
21
+ }
22
+ }
@@ -0,0 +1,8 @@
1
+ {
2
+ "extends": "@cloudflare/workers-tsconfig/tsconfig.json",
3
+ "compilerOptions": {
4
+ "types": ["@cloudflare/workers-types"]
5
+ },
6
+ "include": ["**/*.ts"],
7
+ "exclude": ["__tests__", "./init-tests/**"]
8
+ }